Intermediate merging commit to facilitate mouse wheel zooming.
Merge branch 'spring_2013' of https://github.com/UpWind/devel into spring_2013

Conflicts:
	upwind/src/UWPlugins/QtRenderer/QtRenderer.pro