text edit field and button added to activity_main window layout
Testing pushing to my icon branch.
building & room search fields added, layout updated
Create building details page
Ignore bin
Merge branch 'develop' of github.com:Classlocus/ClassLocus into feature/details_ui
Added search intent
Adding name field and string for building description
Added action bar search
added search & back icons for action bar, updated code refs to point to new icons
integration of Google Maps API v2 and Google Play Services, initial map demo
Merge branch 'develop' into feature/details_ui

Rebase details_ui branch to pull updated interface.

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/com/example/classlocus/MainActivity.class
	bin/classes/com/example/classlocus/R$layout.class
	bin/classes/com/example/classlocus/R$menu.class
	bin/classes/com/example/classlocus/R$string.class
	bin/classes/com/example/classlocus/R$style.class
	gen/com/example/classlocus/R.java
	res/values/strings.xml
Fix building name string id
Recent search query feature added to search in action bar, clear history button in action bar menu
Merge branch 'feature/details_ui' into develop

Details page to be called by about button
added about menu item launching Building_Details activity
commented out the EditView and TextView of layout in activity_main.xml