Remove an unused method and field from EntityFlag.
Fix solar energy tooltip and solar energy capacity.
Merge remote-tracking branch 'origin/master'