Building info screen no longer flashes the logo on entry.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	eclipseProj/res/layout/activity_building_info.xml