Move declaration of a new models class to res/classes
Merge remote-tracking branch 'github/master'