Fixed button locations
added some collision logic
Merge branch 'JD'
Merge branch 'master' of https://github.com/dracul89/unhandledException