added template to resolver
fixed resolver testcase
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into feature/template-twig-var
added changelog line
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into feature/template-twig-var

Conflicts:
	CHANGELOG.md
	src/Sulu/Bundle/WebsiteBundle/Tests/Unit/Sulu/Bundle/WebsiteBundle/Resolver/StructureResolverTest.php
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into feature/template-twig-var

Conflicts:
	CHANGELOG.md
Merge pull request #526 from sulu-cmf/feature/template-twig-var

Added Template var to resolver (Twig-Template)