build new version
updated html5sortable
build new versio
updated version numbers
Merge branch 'master' into develop

Conflicts:
	Resources/public/dist/app.min.1410449409371.js
	Resources/public/dist/app.min.1412149985737.js
	Resources/public/dist/app.min.1412150050305.js
	Resources/views/Admin/index.html.dist.twig
	composer.json