#6
#5 refactored BatteryType class
#4 annotations in entity class
#7 optimized test
Merge pull request #8 from arkadiych/todos_and_comments

Todos and comments