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

Conflicts:
	composer.json
moved content query to content component
fixed typo
added service config
added content type data mapping
added stopwatch
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into hotfix/content-query
added nested params test
added nested params
added phpdoc
make target optional
adaptions with properties and default vars
fixed list to tree converter
added order function
added reverse-proxy ttl handling
cleanup
updated doc headers