upload file
upload file
Merge branch 'master' of https://github.com/gorgee/pearl2

Conflicts:
	src/Pearl2/DemoBundle/Resources/config/routing.yml
Merge branch 'master' of https://github.com/gorgee/pearl2

Conflicts:
	src/Pearl2/DemoBundle/Controller/DefaultController.php
upload file
Permission class