allocator update

-added allocator system and UI
-added separate values for increase rates
Merge remote-tracking branch 'origin/master'

Conflicts:
	states/game.lua