Changes made by Rene MOLIA (rene.molia@openrsi.fr).
Changes made by Rene MOLIA (rene.molia@openrsi.fr).
Merge branch 'master' of https://github.com/OpenRSI/ComunApp.git
Changes made by Rene MOLIA (rene.molia@openrsi.fr).
Merge branch 'master' of https://github.com/OpenRSI/ComunApp.git

Conflicts:
	ComunApp/twitter.html