Merge remote-tracking branch 'origin/master' into Deployment

Conflicts:
	DCSArchivingSystem/DCSArchivingSystem/settings.py
	DCSArchivingSystem/DCSArchivingSystem/testapp/templates/request_delete.html
	DCSArchivingSystem/DCSArchivingSystem/testapp/templates/template2.html
	DCSArchivingSystem/DCSArchivingSystem/testapp/views.py
Merged from maser