New UI stuff
Merge branch 'ActualAppLayoutStuff'

Conflicts:
	project.properties