Merge remote-tracking branch 'slipson/master'
Merge remote-tracking branch 'slipson/master'
move model classes to .shared package