fixes to energy distribution and hobbit distribution by players
Merge branch 'master' of github.com:Techbot/JiGS