DEV 1.0
Merge branch 'master' of https://github.com/skardous/Bourse.git

Conflicts:
	src/main/webapp/login/login.xhtml
	src/main/webapp/resources/css/default.css