NR-226 : Create login functionality in Ally framework
NR-226 : Create login functionality in Ally framework
NR-226 : Create login functionality in Ally framework
NR-226 : Create login functionality in Ally framework
NR-226 : Create login functionality in Ally framework
NR-226 : Create login functionality in Ally framework
Merge branch 'master' into devel

Conflicts:
	distribution/components/ally_api-1.0.dev-py3.2.egg
	distribution/components/ally_authentication-1.0.dev-py3.2.egg
	distribution/components/ally_authentication_core-1.0.dev-py3.2.egg
	distribution/components/ally_authentication_http-1.0.dev-py3.2.egg
	distribution/components/ally_core-1.0.dev-py3.2.egg
	distribution/components/ally_core_babel-1.0.dev-py3.2.egg
	distribution/components/ally_core_http-1.0.dev-py3.2.egg
	distribution/components/ally_core_plugin-1.0.dev-py3.2.egg
	distribution/components/ally_core_sqlalchemy-1.0.dev-py3.2.egg
	distribution/components/ally_utilities-1.0.dev-py3.2.egg
	distribution/components/support_administration-1.0.dev-py3.2.egg
	distribution/components/support_cdm-1.0.dev-py3.2.egg
	distribution/components/support_development-1.0.dev-py3.2.egg
	distribution/plugins/gui_action-1.0.dev-py3.2.egg
	distribution/plugins/gui_core-1.0.dev-py3.2.egg
	distribution/plugins/internationalization-1.0.dev-py3.2.egg
	distribution/plugins/introspection_request-1.0.dev-py3.2.egg
	distribution/plugins/support_sqlalchemy-1.0.dev-py3.2.egg
	superdesk/distribution/components/ally_api-1.0.dev-py3.2.egg
	superdesk/distribution/components/ally_authentication-1.0.dev-py3.2.egg
	superdesk/distribution/components/ally_authentication_core-1.0.dev-py3.2.egg
	superdesk/distribution/components/ally_authentication_http-1.0.dev-py3.2.egg
	superdesk/distribution/components/ally_core-1.0.dev-py3.2.egg
	superdesk/distribution/components/ally_core_babel-1.0.dev-py3.2.egg
	superdesk/distribution/components/ally_core_http-1.0.dev-py3.2.egg
	superdesk/distribution/components/ally_core_plugin-1.0.dev-py3.2.egg
	superdesk/distribution/components/ally_core_sqlalchemy-1.0.dev-py3.2.egg
	superdesk/distribution/components/ally_utilities-1.0.dev-py3.2.egg
	superdesk/distribution/components/support_administration-1.0.dev-py3.2.egg
	superdesk/distribution/components/support_cdm-1.0.dev-py3.2.egg
	superdesk/distribution/components/support_development-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/gui_action-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/gui_core-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/internationalization-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/introspection_request-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/livedesk-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/superdesk-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/superdesk_address-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/superdesk_collaborator-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/superdesk_country-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/superdesk_language-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/superdesk_person-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/superdesk_post-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/superdesk_source-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/superdesk_user-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/support_sqlalchemy-1.0.dev-py3.2.egg