Added sluggable and timestampable
Merge branch 'develop'