hehe
Merge branch 'group3' of https://github.com/justinwm/SE-Payment into group3

Conflicts:
	Conf/config.php
Merge branch 'group3' of https://github.com/justinwm/SE-Payment into group3