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

Conflicts:
	www/config.xml