Added TimeStampedModel ABC
Merge branch 'develop'