Add default for buildingSelection
Comment database test code
remove cancel commented code
onResume() check for getWindow() == null
Update version 2 -> 3
Add default builingSelection