Office Commit
Merge branch 'master' of github.com:lucheins/GoTransfer

Conflicts:
	Resources/android/alloy/controllers/bookForm.js
	tiapp.xml
Fake Commit