gkhj
Merge branch 'master' of https://github.com/a4p/x-cint

Conflicts:
	www/config.xml
	www/index.html
	www/l4p/css/c4p-theme-apps4pro.min.css
	www/l4p/libs/js/l4p.min.js
	www/models/c4p_conf.json
	www/models/local_en.json
	www/models/local_fr.json