Merge branch 'master' of github.com:itdoors/sd
Merge branch 'master' of github.com:itdoors/sd
test
Merge branch 'master' of github.com:itdoors/sd
Merge branch 'master' of github.com:itdoors/sd
Merge branch 'master' of github.com:itdoors/sd
test
Merge branch 'master' of github.com:itdoors/sd
Merge branch 'master' of github.com:itdoors/sd
Merge branch 'master' of github.com:itdoors/sd
Merge branch 'staging'
test
Merge branch 'master' of github.com:itdoors/sd

Conflicts:
	composer.lock
	src/ITDoors/OperBundle/Controller/OperScheduleController.php
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'

Conflicts:
	src/ITDoors/OperBundle/Controller/OperScheduleController.php
Merge remote-tracking branch 'origin/staging'
Merge remote-tracking branch 'origin/staging'
Merge remote-tracking branch 'origin/staging'