beas removed.
Merge branch 'master' of https://github.com/DCSP06/bull-e-xchange

Conflicts:
	DbManager.php
	sign-up.php