Add htaccess which should redirect all users to web/ directory.
Merge remote-tracking branch 'origin/master'
Use configserviceprovider to detect dev/prod. Add Doctrine settings which read from config settings.