Merging site and database
Merge branch 'master' of https://github.com/haroldhues/custom-orders

Conflicts:
	editorder.php
	editplant.php
	viewcontainer.php