updated translation keys
updated gitignore to ignore uploads as well
removed double SuluMediaBundle registration
Merge branch 'develop' of github.com:sulu-cmf/sulu-standard into release/0.4.0
removed bundles not included in 0.4.0
Merge branch 'release/0.4.0'
Merge branch 'master' of github.com:sulu-cmf/sulu-standard

Conflicts:
	app/Resources/public/js/translations/sulu.de.json
	app/Resources/public/js/translations/sulu.de.xlf
	app/Resources/public/js/translations/sulu.en.json
	app/Resources/public/js/translations/sulu.en.xlf
updated dependencies back to develop
updated translations
Merge branch 'develop' of github.com:sulu-cmf/sulu-standard into develop