added file types for media datagrid
created new type
Merge pull request #108 from sulu-cmf/feature/media-bundle

[FEATURE] added file types for media datagrid
used latest version of FOSRestBundle
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into develop

Conflicts:
	composer.json
fixed typo
Merge branch 'feature/load-tree' into develop
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into feature/history-delete