Changes made by Laurent STAELENS (laurent.staelens@openrsi.Fr).
Changes made by Laurent STAELENS (laurent.staelens@openrsi.Fr).
Merge branch 'master' of https://github.com/OpenRSI/ComunApp.git

Conflicts:
	ComunApp/css/main.css
	ComunApp/index.html