Merge branch 'master' of gway.ch:/var/www/vhosts/blessalifedev.gatewaypeople.com/httpdocs/

Conflicts:
	wp-content/themes/blessalife-inspire-child/functions.php
Merge branch 'master' of github.com:gateway-church/blessalife

Conflicts:
	wp-content/themes/blessalife-inspire-child/functions.php
	wp-content/themes/inspire/functions.php