reverted back on Display modifications
prepping release
updated version.txt
Merge remote-tracking branch 'doug/master'
Merge branch 'master' into openGL2