Minor fixes.
Merge branch 'feature/web-dev' of https://github.com/dolstrm001/Demeter-Project into feature/web-dev

Conflicts:
	Webclient/baseComponents/header/header.php
	Webclient/basicskin.php