Merge branch 'master' of github.com:apigee/usergrid-portal-internal into portal-redesign

Conflicts:
	js/app/usergrid.appSDK.js
Merge branch 'development' of github.com:apigee/usergrid-portal into portal-redesign

Conflicts:
	js/app/usergrid.appSDK.js