save
Merge branch 'master' of github.com:jarvys/lightapp-express into github

Conflicts:
	templates/portal/send.html
refine login page