First version of adminView.jsp (html/css only)
Merge branch 'master' of https://github.com/patr7/conf-reg-sys

Conflicts:
	WebContent/login.jsp
First version of adminView.jsp (html/css only)
Merge branch 'master' of https://github.com/patr7/conf-reg-sys

Conflicts:
	WebContent/WEB-INF/web.xml
Merge branch 'master' of https://github.com/patr7/conf-reg-sys