merge
merge
Merge branch 'master' of https://github.com/nestof/domoWeb.git

Conflicts:
	WebContent/domotique.sqlite