#21 Some jsp refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	webapp/web/auth.jsp