Adds xml annotations to UsagePoint model
Refactors UsagePointRepositoryImplTests
Adds usage point import tool
Adds marshal to BaseEntity
Changes back to using hypersonic by default