Various refactoring and scaladoc
Merge pull request #2366 from cchantep/anorm-refact

Various refactoring and scaladoc