-Implemented new Energy System
Merge remote-tracking branch 'origin/master'