Merge pull request #10 from chorus-frogs-2014/backend

updates database to new schema that includes subscription join table
Merge pull request #11 from chorus-frogs-2014/backend

additional DB changes
g
Merge branch 'master' into backend