Added model classes to buildpath
Merge remote-tracking branch 'forry/master'
STUFFFFFFFF
Pushing latest changes