Merge branch 'hotfix/null-url-caching-bug'
updated composer
updated version numbers
Merge branch 'develop'

Conflicts:
	composer.json
fixed find localization bug
added false test
fixed typo
Merge pull request #267 from sulu-cmf/hotfix/find-locale

[HOTFIX] Fixed find localization bug
Merge branch 'master' into develop
Merge branch 'master' of git://github.com/sulu-cmf/sulu into develop

Conflicts:
	tests/Sulu/Component/Webspace/WebspaceTest.php