Logout/Login
Reg Form
Merge branch 'master' of https://github.com/emelga00/stagecraft.git

Conflicts:
	WebContent/WEB-INF/views/login.jsp