merge master and fix conflict in background.coffee
remove personId - this is an optional mustache field.
merging
Merge branch 'insite' into nectar