Updates to templates

JUST templates
Merge branch 'master' of https://github.com/mnizinski79/Network-Packaging-Partners

Conflicts:
	_htmlTemplates/css/global.css