mac changes
Merge branch 'master' of https://github.com/andreypetrov/StreetGuess

Conflicts:
	res/layout/activity_street_view.xml
	src/com/petrovdevelopment/streetguess/StreetViewActivity.java
	src/com/petrovdevelopment/streetguess/model/Location.java