rewrite rule update & depupdate
working @ school
Merge branch 'master' of github.com:Enteee/ch.bfh.bti7054.w2014.p.webshop

Conflicts:
	controller/StartController.php
	www/index.php