Merge branch 'master' of github.com:superdesk/superdesk-server

Conflicts:
	app.py
	superdesk/activity.py
	superdesk/archive/archive_media.py