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

Anorm refactoring