Updated config
Merge branch 'master' of https://github.com/bpmurray/testApp

Conflicts:
	config.xml