tras
Merge branch 'master' of https://github.com/a4p/x-cdev

Conflicts:
	www/index.html
	www/js/c4p.client.js
	www/l4p/css/c4p-theme-apps4pro.min.css
	www/l4p/img/logo_meeting_.png
	www/l4p/img/meeting-background.jpg
	www/models/c4p_conf.json
	www/models/local_en.json
	www/models/local_fr.json