refactored entity storage size/count
Merge branch 'master' of https://code.google.com/p/bugengine