msvc changes
Merge branch 'master' of https://github.com/jkozera/zeal

Conflicts:
	zeal/mainwindow.cpp