Refactored event-recording process to better handle nil property values
Merge branch 'master' of https://github.com/Indicative/iOS