NR-240 : Media Archive - Video plugin
Merge branch 'devel' of dev.sourcefabric.org:rest_api into devel

Conflicts:
	components/ally-authentication-core/ally/core/authentication/api/authentication.py
	components/ally-authentication-http/__setup__/ally_authentication_http/processor.py
	components/ally-core-http/test/unit_testing/ally/core/http/impl/decoder_urlencoded.py
	components/ally-core/ally/core/impl/processor/converter.py
	components/ally-core/ally/core/impl/processor/decoder_none.py
	components/ally-core/ally/core/impl/processor/decoding.py
	components/ally-core/ally/core/impl/processor/encoding.py
	components/ally-core/ally/core/impl/processor/explain_detailed_error.py
	components/ally-core/ally/core/impl/processor/request_types.py
	components/ally-core/test/ally/__setup__/__init__.py
	components/ally-core/test/ally/__setup__/assembler.py
	components/ally-core/test/ally/__setup__/converter.py
	components/ally-core/test/ally/__setup__/resource_management.py
	components/ally-core/test/ally/core/encoder_text.py
	components/ally-core/test/ally/core/encoder_text_xml.py
	components/ally-core/test/ally/core/samples/api/__init__.py
	components/ally-core/test/ally/core/samples/api/article.py
	components/ally-core/test/ally/core/samples/api/article_type.py
	components/ally-core/test/ally/core/samples/api/entity.py
	components/ally-core/test/ally/core/samples/impl/__init__.py
	components/ally-core/test/ally/core/samples/impl/article.py
	components/ally-core/test/ally/core/samples/impl/article_type.py
	components/ally-core/test/ally/core/samples/impl/entity.py
	components/ally-utilities/test/unit_testing/ally/container/binder.py
	components/support-cdm/ally/core/cdm/processor/content_delivery.py
	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
	plugins/internationalization/internationalization/core/impl/po_file_manager.py
	plugins/internationalization/test/__init__.py
	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
	superdesk/plugins/livedesk/livedesk/impl/blog_post.py
	superdesk/plugins/livedesk/livedesk/meta/blog_post.py
	superdesk/plugins/media-archive-image/__plugin__/media_archive_image/service.py
	superdesk/plugins/media-archive-image/superdesk/media_archive/api/image_data.py
	superdesk/plugins/media-archive-image/superdesk/media_archive/api/image_info.py
	superdesk/plugins/media-archive-image/superdesk/media_archive/impl/image_persist.py
	superdesk/plugins/media-archive-image/superdesk/media_archive/meta/image_data.py
	superdesk/plugins/media-archive-image/superdesk/media_archive/meta/image_info.py
	superdesk/plugins/media-archive/__plugin__/media_archive/service.py
	superdesk/plugins/media-archive/superdesk/media_archive/api/meta_data.py
	superdesk/plugins/media-archive/superdesk/media_archive/api/meta_info.py
	superdesk/plugins/superdesk-post/superdesk/post/impl/post.py
	superdesk/plugins/superdesk-user/__plugin__/superdesk_user/authenticate.py
	superdesk/plugins/superdesk-user/superdesk/user/impl/user.py
	superdesk/plugins/superdesk/__plugin__/superdesk/db_superdesk.py
	superdesk/plugins/superdesk/__plugin__/superdesk/service.py
removed temporary merge file
NR-224: Core implementation of MVC framework - part 2

Eggs layed
NR-248 : URL management

added some concepts and handlers in superdesk.navigation,
made a custom implementation in livedesk submenu
NR-209 - UI Optimization & Fixes

X-Filter and some sync functionallity
NR-209: UI Optimization & Fixes

Added View class to the gizmo
Added Class implementation in utils
Added Extend for extending the basic function implementation of
javascript 1.8.5
Revert "NR-209: UI Optimization & Fixes"

This reverts commit 9c26929153600577bd431693e2f3074007fc81e9.
Revert "Revert "NR-209: UI Optimization & Fixes""

This reverts commit 2e65a4a3fd979fe7b2d9536af5ea77cbcdc579c2.
NR-209 - UI Optimization & Fixes

unique object container for models
NR-209: UI Optimization & Fixes

Added the bat file
All the changes go to newgizmo.js
NR-209: UI Optimization & Fixes

Added newgizmo the extended version
NR-209 - UI Optimization & Fixes

huge changes to collections and models' behavior.
NR-209: UI Optimization & Fixes

Modification of View
NR-209 : UI Optimization & Fixes

Insert function
NR-209 : UI Optimization & Fixes

Unit testing support with QUnit
NR-209 : UI Optimization & Fixes

wip delete from collection
NR-216 : UI MVC - Collection implementation

Handles models delete
Added README file
NR-216 : UI MVC - Collection implementation

Added tests for insert and update actions