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
Merge branch 'develop' of github.com:sulu-cmf/sulu-standard into feature/media-selection-template
moved display options to class
Merge branch 'feature/media-selection-template' into develop
Merge branch 'develop' of github.com:sulu-cmf/sulu-standard into develop