.
Merge branch 'master' of https://github.com/simon-ansquer/SupErp.git
.
Merge branch 'master' of https://github.com/simon-ansquer/SupErp.git
Merge branch 'master' of https://github.com/simon-ansquer/SupErp

Conflicts:
	SupErp/SupErp.IHM/SupErp.IHM.csproj