Attempting v2 api change
Merge branch 'master' of https://github.com/Make-Magazine/makerfaire
test changes for entity
Merge branch 'master' of https://github.com/Make-Magazine/makerfaire
Merge branch 'master' into develop