Revert "merged into new env"

This reverts commit 38dbec0d99df01f137adb0547777fdfee879fbb3.
Merge branch 'master' of https://github.com/Enteee/ch.bfh.bti7054.w2014.p.webshop

Conflicts:
	src/layout/start.php