All 3 Welcome Pages Fixed Completely No More changes required
Merge branch 'master' of github.com:ducdigital/s42m

Conflicts:
	scss/components/components.scss
	www/css/app.min.css
Merge branch 'master' of github.com:ducdigital/s42m

Conflicts:
	scss/components/components.scss
	www/css/app.min.css