bug fixes
Merge branch 'master' of https://github.com/FriendlyNPC/TopGun_Jquery
Merge branch 'master' of https://github.com/FriendlyNPC/TopGun_Jquery
added java questions