Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/login.jsp
	WebContent/registration.jsp