task 582 - History staff
task 582 - History staff
task 582 - History staff
task 582 - History staff
task 582 - History staff
task 582 - History staff
Merge branch 'staging' of github.com:itdoors/sd into staging

Conflicts:
	src/ITDoors/AjaxBundle
task-602
task-602
task-602
task-601
task-601
task-601