Switching screens with building information
project.properties removed???
Merge branch 'master' of https://github.com/kttietz/Loofiti

Conflicts:
	project.properties