Ajustes
Merge branch '7.0' of github.com:monocon/openerp into 7.0

Conflicts:
	boletos
	mailgun
	project-scrum