small fix
Removed declarations of energy_inline.hpp from energy.hpp
Merge pull request #182 from HRZaheri/master

fix "rest1" test