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
resolved conflict
Merge branch 'development' into authentication_from_scratch
Removed coffee script,unblocked password,removed facebook error redirection