Merge branch 'hotfix/scrolling'
updated version numbers
updated version number in dist file
fixed option typo
adapted version numbers
Merge branch 'hotfix/overlay' into develop

Conflicts:
	Resources/public/dist/app.min.1406819510410.css
	Resources/public/dist/app.min.1407334441804.css
	Resources/public/dist/app.min.1407418645479.css
	Resources/public/dist/app.min.1407418645479.js
	Resources/public/dist/app.min.js
	Resources/views/Admin/index.html.dist.twig
	Resources/views/Admin/index.html.twig
	composer.json