Merge with oper

Conflicts:
	src/ITDoors/AjaxBundle
	src/ITDoors/CommonBundle