Updated models to fix small errors and added timestamps to models
Resolved conflicts while merging another branch
Updated gemfile to resolve merge conflict and fix the rubyracer version