paso5
Merge branch 'master' of https://github.com/tibujr/ayahuasca

Conflicts:
	www/config.xml