Merged changes from upstream.
Merge branch 'registration' of https://github.com/FengLee/A7B36SI2.git
into registration

Conflicts:
	naKup/src/main/webapp/WEB-INF/jsp/profile.jsp
	naKup/src/main/webapp/WEB-INF/jsp/profileEditation.jsp
	naKup/src/main/webapp/gui/css/screen.css