Merge remote-tracking branch 'origin/master'

Conflicts:
	Resources/android/alloy/controllers/main.js
	Resources/android/alloy/controllers/person.js
	Resources/android/alloy/styles/login.js
	Resources/android/alloy/styles/main.js
	Resources/android/alloy/styles/person.js