Merge branch 'master' of github.com:itdoors/sd
#call-btn
#ami
Merge remote-tracking branch 'origin/task-910-history' into task-sipml

Conflicts:
	app/config/config.yml
	app/config/parameters.yml.dist
	composer.lock
#ami
#ami
#ami
#ami
Merge branch 'staging' into task-sipml

Conflicts:
	app/AppKernel.php
	app/config/config.yml
	app/config/parameters.yml.dist
	app/migration.sql
	composer.lock
merge
Merge branch 'task-sipml' of github.com:itdoors/sd into task-sipml
#ami
Merge branch 'task-sipml' of github.com:itdoors/sd into task-sipml
merge
Merge branch 'staging' of github.com:itdoors/sd into staging
task-simpl
invoice-bag
task-sipml
#ami
#ami