Added compareTo() methods to models
Merge origin/master