Merge with Ace1.3
Merge branch 'master' of https://github.com/orachid/school.git

Conflicts:
	school-web-rebirth/src/main/webapp/WEB-INF/views/pages/partials/login/login_box.jsp