[rkward/frameworks] rkward: Merge branch 'master' into frameworks

[Thomas Friedrichsmeier]

Git commit f26e82abee360d85c0195609d9b57a328c217789 by Thomas Friedrichsmeier.
Committed on 18/11/2015 at 14:33.
Pushed by tfry into branch 'frameworks'.

Merge branch 'master' into frameworks

Conflicts:
	rkward/plugin/rkvarselector.cpp

M  +63   -23   rkward/dialogs/rkloadlibsdialog.cpp
M  +1    -0    rkward/misc/CMakeLists.txt
M  +48   -10   rkward/misc/rkobjectlistview.cpp
M  +19   -3    rkward/plugin/rkvarselector.cpp
M  +1    -1    rkward/settings/rksettingsmoduler.cpp
M  +1    -1    rkward/windows/robjectbrowser.cpp

http://commits.kde.org/rkward/f26e82abee360d85c0195609d9b57a328c217789