Revert "removed merge conflict"

This reverts commit 823cacdb394b1beb92a411f124774ec7ac8b14bc.
Merge branch 'master' of github.com:learnery/learnery
default state for all rsvps is "new"
merged master down and fixed tests
only deploy master branch
merge only build master from master to review branch