Merge branches 'master' and 'master_co_base' of https://github.com/odoo-colombia/odoo-colombia

Conflicts:
	.LICENSE.md
	l10n_co_base/__openerp__.py
	l10n_co_base/data/res.country.state.city.csv
	l10n_co_base/models/__init__.py