Fixed errors when compiling
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/ps/blob/blobsps/Blob.java

Note: DO NOT commit the google_maps_api.xml file