Anorm refactoring
Merge pull request #2308 from cchantep/anorm-refact

Anorm refactoring