beta 0404
beta 0404
hot fix
- header.jsp
- login.jsp
Merge branch 'beta' into develop

Conflicts:
	build/classes/.gitignore