Merge pull request #4 from iaen-edu/staging

update branch
eliminando py~
Merge pull request #20 from palichis/staging

Merge pull request #4 from iaen-edu/staging
Merge branch 'staging' of https://github.com/palichis/refactory into staging

Conflicts:
	.gitignore
correct conflicts .gitignore
Merge pull request #21 from palichis/staging

eliminación de .py~
Merge branch 'staging' of https://github.com/iaen-edu/refactory into iaen-edu-staging

Conflicts:
	.gitignore
	iaen_base/__openerp__.py~
	iaen_base/iaen_base.py~
Merge branch 'iaen-edu-staging' into staging