admin msi
Merge branch 'master' of https://github.com/Babouchot/Octo-photo

Conflicts:
	Octo-photo-library/ImageInterface.cs
before pull
Merge branch 'Ancelin' of https://github.com/Babouchot/Octo-photo
Merge branch 'Ancelin' of https://github.com/Babouchot/Octo-photo
db password