Acton
Acton
Merge branch 'master' of https://github.com/h4414/ghome

Conflicts:
	src/main/webapp/html/js/regles.js

	modified:   src/main/webapp/html/js/regles.js