commit last
Merge branch 'master' of https://github.com/joaquinPega/exam

Conflicts:
	simple-webapp/src/main/webapp/admin.jsp
	simple-webapp/src/main/webapp/js/Scripts.js