misc
Merge branch 'develop' of https://github.com/pixmeo/osirixplugins into develop

Conflicts:
	.gitignore