Merge branch 'feature/init_classes' into feature/rest_services
started with ui excluded some properties from the api
continued with ui
merged with init_rest
Merge pull request #2 from sulu-cmf/feature/rest_services

Build Rest Webservices for Collection and Medias
ui
Merge branch 'feature/media-manager' of git://github.com/sulu-cmf/SuluMediaBundle into feature/media-ui
Merge branch 'feature/media-manager' of git://github.com/sulu-cmf/SuluMediaBundle into feature/media-ui
Merge branch 'feature/media-manager' of git://github.com/sulu-cmf/SuluMediaBundle into feature/media-ui
Merge branch 'feature/media-manager' of git://github.com/sulu-cmf/SuluMediaBundle into feature/media-ui
ui file upload
Merge pull request #4 from sulu-cmf/feature/media-ui

feature/media-ui
Merge branch 'feature/media-manager' of git://github.com/sulu-cmf/SuluMediaBundle into feature/media-ui
merged with media-manager
Merge branch 'feature/media-manager' of git://github.com/sulu-cmf/SuluMediaBundle into feature/media-ui
updated rest bundle version
Merge branch 'develop' of git://github.com/sulu-cmf/SuluMediaBundle into feature/media-ui
Merge branch 'feature/media-manager' of git://github.com/sulu-cmf/SuluMediaBundle into feature/media-ui
reset fos rest bundle version
Merge branch 'develop' of git://github.com/sulu-cmf/SuluMediaBundle into feature/media-ui