init
Merge branch 'master' of https://github.com/sunnylqm/xdhapp

Conflicts:
	www/config.xml
	www/index.html