cleaned code
Merge branch 'bugfix/fileversion' of git://github.com/sulu-cmf/SuluMediaBundle into bugfix/fileversion

Conflicts:
	Api/Collection.php
	Api/Media.php