registration / db
Merge branch 'master' of
https://github.com/kochm8/ch.bfh.bti7054.w2014.p.beerwebshop

Conflicts:
	classes/DBHandler.php
	classes/User.php
	doc/mysql_import.sql
	register.php