#4 connected registration page and reset password page with mail service
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/src/com/sunflower/web/MailServer.java