Merge remote-tracking branch 'upstream/master' into add-registration-view
Adds seed file and migration changes
adds calendar view
Adds users and events controllers for api.
Adds RABL file for messages/index.
Adds routes format json and user rabl file.
Adds users and messages controller spec, reg hbs, users controller.
Merge upstream  master
Adds messages controller create test.
Merge pull request #19 from nwre87/add-json-api

Add JSON API stuff from Nigel.