added localized template title
updated version numbers
Merge pull request #200 from sulu-cmf/hotfix/content-settings

[HOTFIX] Stabilize content settings tab
Merge branch 'master' of git://github.com/sulu-cmf/SuluContentBundle into hotfix/localized-template-title

Conflicts:
	Resources/public/dist/components/content/main.js
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into hotfix/localized-template-title

Conflicts:
	composer.json
Merge pull request #204 from sulu-cmf/hotfix/localized-template-title

Hotfix/localized template title