Merge pull request #457 from kyuri/upstream

Listview: misspelling fix
Readme updates about Grunt
Resolved fields conflicts
Cancelled events will now return undefined. It was largely inconsistent before.