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

Conflicts:
	trusteeapp/bin/.gitignore