added template resolver
adapted config
fixed get url by key in cache
updated version numbers
added null check before expire
fixed phpdoc
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into feature/template-resolver

Conflicts:
	src/Sulu/Component/Content/Mapper/ContentMapper.php
Merge branch 'feature/template-resolver' into develop
Merge branch 'hotfix/null-url-caching-bug' into develop

Conflicts:
	composer.json
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into feature/request-format
added more fields to twig templates