MD-21
Merge branch 'develop' of https://github.com/pixmeo/osirix into develop

Conflicts:
	Binaries/English.lproj/MPR.xib
	Binaries/English.lproj/MainMenu.xib