Merge branch 'hotfix/configFix'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Added cssembed-bin.
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	composer.json
	composer.lock
Added FOS Rest bundle.
Merge branch 'hotfix/addFOSRestBundle' into develop