updated config
Merge branch 'master' of https://github.com/shaunretief/quattro

Conflicts:
	config.xml