"rewamping room rect"
Merge branch 'developer' of https://github.com/AndroidSquad/Coloristance into developer

Conflicts:
	res/layout/firstscreen.xml