Merge branch 'master' into premium-configurator
feat(premium-configurator): add bundle
feat(premium-configurator): basic workflow
chore(merge): merge branch 'master' into premium-configurator

Conflicts:
	app/config/routing.yml
	src/Dothiv/CharityWebsiteBundle/Resources/views/page.html.twig
	src/Dothiv/RegistryWebsiteBundle/Resources/views/page.html.twig
chore(update): update to 1.2.21
feat(premium-configurator): implement preview, fullscreen mode
feat(premium-configurator): use real click counter files in preview
feat(premium-configurator): add form for images
chore(merge): merge branch 'master' into premium-configurator

Conflicts:
	app/config/routing.yml
feat(uploads): add public uploads
feat(premium-configurator): implement image upload
Merge branch 'master' into premium-configurator
refactor(attachments): generalized storage of attachments
feat(premium-configurator): moved tests to this bundle
refactor(assets): move scaling to separate service
refactor(premium-configurator): use bundle uploader
fix(PathValue): add more \SplFileInfo methods
feat(premium-configurator): generalizied image upload
chore(styles): for cssrewrite to work we need to use bundle path

See http://symfony.com/doc/2.3/cookbook/assetic/asset_management.html#cookbook-assetic-cssrewrite
feat(premium-configurator): add color picker