changes
Merge branch 'master' of https://github.com/anuj-cardinalts/cardinalts-demo

Conflicts:
	config.xml