config.xml
Merge branch 'master' of https://github.com/lemanahuel/BRAPP

Conflicts:
	config.xml