Merge remote-tracking branch 'origin/dev' into dev
Merge branch 'dev' of https://github.com/stevenhillcox/Grad-Project-2014 into dev
Updated project to allow for native windows deployment