Merge branch 'master' of https://github.com/Kain91/wiedwp

Conflicts:
	app/wp-content/themes/wied/home.php
Merge branch 'master' of https://github.com/Kain91/wiedwp

Conflicts:
	.idea/workspace.xml