Commented config.xml
Commented index.html
Removed inline html listeners
Merge branch 'master' into doc

Conflicts:
	www/index.html