OK
Merge branch 'master' of https://github.com/cursorcl/trustee.android.app

Conflicts:
	trusteeapp/bin/.gitignore