Merge remote-tracking branch 'patrick/master'
Merge remote-tracking branch 'patrick/master'
Merge remote-tracking branch 'patrick/master'
Merge remote-tracking branch 'patrick/master'
Merge remote-tracking branch 'patrick/master'
Adding cursoring and annotation to viewer
Add cursor widget class (missed last commit)
Modifying project to include other image modalities
Merge remote-tracking branch 'dean/master'

Conflicts:
	build/CMakeLists.txt