updated SSO
update to fix portal logout
Merge branch 'gh-pages' of github.com:apigee/usergrid-portal-internal
fixed invalid token logout
removed redundant logout call
Merge branch 'master' of github.com:apigee/usergrid-portal-internal into current-portal
Merge branch 'development' of github.com:apigee/usergrid-portal into current-portal

Conflicts:
	js/app/usergrid.appSDK.js