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

Conflicts:
	oblify-app/Oblify/bin/Oblify.apk
	oblify-app/Oblify/bin/resources.ap_
Merge branch 'master' of github.com:Oblify/Server

Conflicts:
	oblify-app/Oblify/bin/Oblify.apk
	oblify-app/Oblify/bin/classes.dex
	oblify-app/Oblify/bin/classes/com/groups/oblify/MainActivity.class
	oblify-app/Oblify/bin/resources.ap_
	oblify-app/Oblify/res/values/strings.xml
update