Merge tag 'tags/v1.6.9'

Conflicts:
	.gitignore
	app/classes/lib.php
	app/config/permissions.yml.dist
	app/extensions/RelatedContentByTags/extension.php
	app/resources/translations/de/contenttypes.de.yml
	app/resources/translations/de/messages.de.yml
	app/src/Bolt/Application.php
	app/src/Bolt/Controllers/Backend.php
	app/src/Bolt/Controllers/Frontend.php
	app/src/Bolt/Storage.php
	app/tests/Bolt/Tests/DeepDiffTest.php
	app/view/_header_basic.twig
	app/view/_sub_editfields.twig
	app/view/_sub_pretty.twig
	app/view/css/bolt.css
	app/view/dashboard-activity.twig
	app/view/extensions.twig
	app/view/login.twig
Merge branch 'master' of https://github.com/doertedev/bolt

Conflicts:
	.gitignore
	app/classes/lib.php
	app/config/permissions.yml.dist
	app/extensions/RelatedContentByTags/extension.php
	app/resources/translations/de/contenttypes.de.yml
	app/resources/translations/de/messages.de.yml
	app/src/Bolt/Application.php
	app/src/Bolt/Controllers/Backend.php
	app/src/Bolt/Controllers/Frontend.php
	app/src/Bolt/Storage.php
	app/tests/Bolt/Tests/DeepDiffTest.php
	app/view/_header_basic.twig
	app/view/_sub_editfields.twig
	app/view/_sub_pretty.twig
	app/view/css/bolt.css
	app/view/dashboard-activity.twig
	app/view/login.twig