Update version number in the windows installer.
Merge branch 'master' of github.com:christopho/solarus
Merge branch 'master' of github.com:christopho/solarus

Conflicts:
	cmake/win32/zsdx/setup/zsdx.iss