co
Merge branch 'master' of https://github.com/guillermonp/Squeezerp

Conflicts:
	squeezerp/database/database_core.py