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

Conflicts:
	README
	app.html
	config.js
	css/styles.css
	css/usergrid.css
	css/usergrid.less
	index.html
	js/app/app.js
	js/app/console.js
	js/app/navigation.js
	js/app/pages.js
	js/app/params.js
	js/app/sso.js
	js/app/ui/collections.entity.js
	js/app/ui/collections.user.js
	js/app/ui/ui.js
	js/app/usergrid.appSDK.js
	js/jquery-ui.min.js
	js/lib/debug/MD5.js
	js/lib/debug/date.js
	js/lib/debug/jquery.dataset.js
	js/lib/debug/jquery.tmpl.js
	js/lib/debug/jquery.ui.statusbar.js
	js/lib/debug/jquery.ui.timepicker.js
	js/lib/debug/jsonlint.js
	js/usergrid.console.ui.navbar.js
	loading.html
	planned_outage.html
	service_down.html
	templates/apigee.ui.collections.user.header.html
	templates/apigee.ui.curl.detail.html
	templates/apigee.ui.groups.table_rows.html
	templates/apigee.ui.panels.group.activities.html
	templates/apigee.ui.panels.group.details.html
	templates/apigee.ui.panels.group.memberships.html
	templates/apigee.ui.panels.group.permissions.html
	templates/apigee.ui.panels.role.users.html
	templates/apigee.ui.panels.user.activities.html
	templates/apigee.ui.panels.user.graph.html
	templates/apigee.ui.panels.user.memberships.html
	templates/apigee.ui.panels.user.permissions.html
	templates/apigee.ui.panels.user.profile.html
	templates/apigee.ui.role.groups.table_rows.html
	templates/apigee.ui.roles.table_rows.html
	templates/apigee.ui.users.table_rows.html
Merge branch 'master' of github.com:apigee/usergrid-portal into development

Conflicts:
	.DS_Store
	README
	app.html