Merge branch 'master' of kde:skrooge into kf5

Conflicts:
	plugins/generic/skg_advice/skgadviceboardwidget.cpp
	plugins/generic/skg_properties/skgpropertiesplugin.cpp
	plugins/skrooge/skrooge_operation/skgoperationpluginwidget_base.ui
	plugins/skrooge/skrooge_report/skgreportpluginwidget.cpp
	skgbasegui/skgobjectmodelbase.cpp
	skgbasemodeler/skgdocument.cpp
	tests/skgbankmodelertest/CMakeLists.txt