Merge branch 'master' of github.com:pimcore/pimcore

Conflicts:
	pimcore/config/texts/en.csv

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5212 1f8fe7d8-47f0-464c-8d0a-336f4953ab05