Added some modules (functions and shopdb)
Merge remote-tracking branch 'origin/simon-branch'

Conflicts:
	Webshop/webroot/header.php
	Webshop/webroot/index.php