phpcs
config
config
staff -> stuff
Merge branch 'staging' of github.com:itdoors/sd into staging
Merge branch 'staging' into oper

Conflicts:
	src/ITDoors/AjaxBundle