Eggs layed & Bugs fixed
Eggs layed & Bugs fixed
Merge branch 'devel' of dev.sourcefabric.org:rest_api into devel

Conflicts:
	superdesk/distribution/plugins/livedesk-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/media_archive-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/media_archive_image-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/superdesk_user-1.0.dev-py3.2.egg
Merge branch 'devel' of dev.sourcefabric.org:rest_api into devel

Conflicts:
	superdesk/distribution/plugins/livedesk-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/media_archive-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/media_archive_image-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/superdesk_user-1.0.dev-py3.2.egg
Eggs layed
NR-308 : User add dialog does now allow the input of the login name

+
NR-309 : User add dialog does not have a password confirmation
NR-310 : The user login name not displayed in the users list
NR-311 : After user add the user is not displayed with all data
NR-312 : The user add dialog is prepopulated
NR-313 : User pagination not proper on user add
NR-314 : The user last name is not saved
NR-308 : User add dialog does now allow the input of the login name

+
NR-309 : User add dialog does not have a password confirmation
NR-310 : The user login name not displayed in the users list
NR-311 : After user add the user is not displayed with all data
NR-312 : The user add dialog is prepopulated
NR-313 : User pagination not proper on user add
NR-314 : The user last name is not saved
NR-308 : User add dialog does now allow the input of the login name

+
NR-309 : User add dialog does not have a password confirmation
NR-310 : The user login name not displayed in the users list
NR-311 : After user add the user is not displayed with all data
NR-312 : The user add dialog is prepopulated
NR-313 : User pagination not proper on user add
NR-314 : The user last name is not saved
NR-308 : User add dialog does now allow the input of the login name

+
NR-309 : User add dialog does not have a password confirmation
NR-310 : The user login name not displayed in the users list
NR-311 : After user add the user is not displayed with all data
NR-312 : The user add dialog is prepopulated
NR-313 : User pagination not proper on user add
NR-314 : The user last name is not saved
Merge branch '255-user-mng-screen' of dev.sourcefabric.org:rest_api into 255-user-mng-screen

Conflicts:
	plugins/gui-core/gui-resources/styles/css/bootstrap.css
	superdesk/plugins/superdesk-user/gui-resources/scripts/js/modules-list.js
Merge branch '255-user-mng-screen' of dev.sourcefabric.org:rest_api into 255-user-mng-screen

Conflicts:
	plugins/gui-core/gui-resources/styles/css/bootstrap.css
	superdesk/plugins/superdesk-user/gui-resources/scripts/js/modules-list.js
Merge branch '255-user-mng-screen' into devel
Merge branch '255-user-mng-screen' into devel
NR 239 : Image plugin change lib java to C
NR 239 : Image plugin change lib java to C
Merge branch '269-Save-UserId-on-upload' into devel

Conflicts:
	superdesk/distribution/plugins/media_archive_image-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/media_archive_video-1.0.dev-py3.2.egg
Merge branch '269-Save-UserId-on-upload' into devel

Conflicts:
	superdesk/distribution/plugins/media_archive_image-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/media_archive_video-1.0.dev-py3.2.egg
Merge branch 'devel' of dev.sourcefabric.org:rest_api into devel

Conflicts:
	superdesk/distribution/plugins/media_archive-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/superdesk_authentication-1.0.dev-py3.2.egg
Merge branch 'devel' of dev.sourcefabric.org:rest_api into devel

Conflicts:
	superdesk/distribution/plugins/media_archive-1.0.dev-py3.2.egg
	superdesk/distribution/plugins/superdesk_authentication-1.0.dev-py3.2.egg
Eggs update