merged from freshwater
Merge branch 'master' of github.com:gorgee/pearl2

Conflicts:
	src/Turbosquid/PearlBundle/Resources/config/routing.yml