updated translation keys
add image proxy routing
initial commit
added media-selection property
added images to template
Merge branch 'develop' of github.com:sulu-cmf/sulu-standard into feature/media-selection-template

Conflicts:
	app/admin/config/config.yml
Merge branch 'feature/template-grid' of github.com:sulu-cmf/sulu-standard into feature/media-selection-template

Conflicts:
	app/admin/config/config.yml
add uploads folder
Merge remote-tracking branch 'origin' into feature/media-bundle
add upload folder
Merge branch 'develop' of github.com:sulu-cmf/sulu-standard into feature/media-bundle
Merge remote-tracking branch 'origin/develop' into feature/media-bundle
udpated dependencies
updated routing
added api routing file
udpated dependencies
Merge branch 'develop' of github.com:sulu-cmf/sulu-standard into feature/media-bundle
udpated dependencies
Merge branch 'feature/media-bundle' of https://github.com/sulu-cmf/sulu-standard into feature/media-bundle
update install documentation