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

Conflicts:
	oblify-app/Oblify/src/com/groups/oblify/MainActivity.java
Merge branch 'master' of github.com:Oblify/Server