merge wip-sql-mapping
Merge branch 'master' of github.com:NalaGinrut/artanis