branch merge
prepping for release
minor fix in Weapon concerning recording data
fixed windows Thread class to correct 64-bit compiling issue