Merge remote-tracking branch 'origin/ui_template' into ui_template

Conflicts:
	www/contactForm.html
	www/lib/style.css

css -tips-contactForm
Merge branch 'ui_template' of https://github.com/joejode/undp-uwi into ui_template