Changes made by Philippe TARRALLE (philippe.tarralle@openrsi.fr).
Merge branch 'master' of https://github.com/OpenRSI/ComunApp.git

Conflicts:
	ComunApp/index.html
Changes made by Philippe TARRALLE (philippe.tarralle@openrsi.fr).
Merge branch 'master' of https://github.com/OpenRSI/ComunApp.git

Conflicts:
	ComunApp/index.html