google now
Merge branch 'Mohammad's-Branch' of github.com:hshacks/hshacks-android into Mohammad's-Branch

Conflicts:
	HSHacks/src/main/res/layout/concierge_cell.xml