config adjustments
Merge branch 'configXML' of https://github.com/sandroacoelho/demo into configXML

Conflicts:
	config/sites.xml
	index.html