Working on app but also fixing 1.7 upgrade
Merge branch 'master' of https://github.com/CICIC/gestioCI_butterfly_release

Conflicts:
	Invoices/models.py