avance xml
Merge branch 'master' of https://github.com/diegozavala/integracion

Conflicts:
	Gemfile.lock