Merge branch 'master' of https://github.com/uzapy/ch.bfh.bti7054.w2013.p.webshop

Conflicts:
	webshop/index.php
asdf
session
index