Fixed user naming convention.
Merge branch 'master' of https://github.com/rbirdman/Dropbox

# By Josh Lepinski (3) and Ryan Bird (2)
# Via Josh Lepinski
* 'master' of https://github.com/rbirdman/Dropbox:
  fixed a spelling error
  Add ‘mini calendar’ function to calendar.
  fixed naming of the two models to datetime
  changed m2m table to match ruby naming and added start and end to calendar items
  Fix routing with user-search