Model mapping
Merge branch 'model-mapping' of github.com:maltray/smallie into model-mapping
Fixing coding style
Adding database
Added tests and model changes