composer-lock
Merge branch 'staging' of github.com:itdoors/sd into staging

Conflicts:
	composer.lock
copser.lock
add user stuff
add user stuff
Merge branch 'staging' of github.com:itdoors/sd into staging
Merge branch 'oper' into staging

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