Merge branch 'master' of https://github.com/debug-Lift/Campus_wap.git
Merge branch 'master' of https://github.com/debug-Lift/Campus_wap.git

Conflicts:
	CampusWap/WebContent/css/register.css