More UI changes for acs user screen
Merge branch 'master' of https://github.com/appcelerator-services/x-platform

Conflicts:
	app/controllers/builtins.js
	app/styles/builtins.tss
	app/views/builtins.xml