Added search intent
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