update
fragments
update
update
update
update
Merge branch 'master' of github.com:Oblify/Server

Conflicts:
	oblify-app/Oblify/project.properties
	oblify-app/Oblify/src/com/groups/oblify/MainActivity.java
	oblify-app/google-play-services_lib/bin/google-play-services_lib.jar