améliorations
Merge branch 'develop'

Conflicts:
	www/css/style.css
	www/js/config.js