misc
misc
Stephen Lyons: compiler warning reduction patch
Merge branch 'fixHeiko'

Conflicts:
	src/T2DMap.cpp
Stephen Lyons: warning reduction patch 2
move to Qt 5.1
Merge with SF
Fixed issue where variable recasting wasn't respecting users choice