test
Merge branch 'master' of https://github.com/versantweb/app_demo

Conflicts:
	config.xml
	index.html