Deal with conflicts in resource creation
Merge branch 'master' of github.com:bedatadriven/activityinfo