Update welcome view.
Merge branch 'master' of https://github.com/themosis/theme

Conflicts:
	app/views/welcome.scout.php
	functions.php