Undid some button functions that were buggy
Merge branch 'master' of https://github.com/CDBuckmaster/Engine9