Merge branch 'develop'

Conflicts:
	.gitignore
Create production ready project
Make sure that migrations are runned on the application server
Make sure we only use stable versions of bundles
Fix assetic bug
MopaBootstrap commit #41267d3e braked our base html
Merge branch 'master' into develop

Conflicts:
	.gitignore