commit ignore
Merge branch 'master' of https://github.com/maxgrafx/MavigProductManager

Conflicts:
	.gitignore
Revert 037445f..26f12e4

This rolls back to commit 037445f1b6cc474ddadb2897a0fa7ed8d32348bc.
nog 1
bla
Revert 80bdbd2..122a656

This rolls back to commit 80bdbd29fcb5272dbe8f1e4dcec713e1fe905f09.
Merge branch 'master' of https://github.com/maxgrafx/MavigProductManager

Conflicts:
	.gitignore