added template resolver
adapted config
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