Merge branch 'master' into develop
updated composer
delete thumbs when media is deleted
fix delete of unexists media
api add type filter
fix tests
add type to mediaselection container
add tests for media selection with types
add downloadcounter to api
Merge pull request #48 from sulu-cmf/feature/download-counter

[FEATURE] add download counter to api
Merge pull request #42 from sulu-cmf/bugfix/delete-thumbs

[BUGFIX] delete thumbs when media is deleted
Merge pull request #47 from sulu-cmf/feature/type-filter

[Feature] Add API Type Filter, add content type filter
Merge branch 'hotfix/content-type' into develop
Merge branch 'develop' of git://github.com/sulu-cmf/SuluMediaBundle into develop

Conflicts:
	Resources/public/dist/components/media-selection/main.js
split settings and files tab
Added CONTRIBUTING
Merge pull request #51 from sulu-cmf/feature/contributing

Added CONTRIBUTING
Merge branch 'develop' of git://github.com/sulu-cmf/SuluMediaBundle into feature/ui
language changing for collection and media
Updated paths for https://github.com/sulu-cmf/sulu-standard/pull/130:wq