sqlite & savevar advaced
Merge branch 'master' of github.com:Enteee/ch.bfh.bti7054.w2014.p.webshop

Conflicts:
	controller/JsonController.php
grey navigation