bin removed
Merge branch 'master' of https://github.com/ffhs/privatecloud

Conflicts:
	PrivateCloudFFHS/bin/classes.dex
	PrivateCloudFFHS/bin/resources.ap_