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

Conflicts:
	oblify-app/Oblify/bin/Oblify.apk
	oblify-app/Oblify/bin/classes.dex