Merge branch 'MBST-9831-feeds-console'

Conflicts:
	atlas-admin-api/index.js
	atlas-admin-frontend/gulpfile.js
	atlas-admin-frontend/js/app.js
	atlas-admin-frontend/js/dist/scripts.js
bump
Refactoring
Added user to whitelist
Oops
version bump
Taken out feeds for prod
widgets url changed from stage to prod
Logout time is now 1 year
wiget url change
Updated widget url
Merge branch 'MBST-9831-feeds-console'
Added feeds routes
updated widget urls in stage
Re-build dist scripts
Merge branch 'MBST-9831-feeds-console'
version bump
Merge branch 'MBST-9831-feeds-console'

Conflicts:
	atlas-admin-api/index.js
	atlas-admin-frontend/gulpfile.js
	atlas-admin-frontend/js/controllers/userProfile.js
	atlas-admin-frontend/js/dist/scripts.js
Widget location change
Login page updates