Renamed Gui to Group
Merge branch 'remoxly_roxlu/master'

Conflicts:
	projects/gui/src/gui/Scroll.cpp