updated associations
fixed merge
Merge branch 'master' of github.com:Eventalist/Eventalist into theerickramer
fizing modal appends
Merge pull request #27 from Eventalist/tdshap

fizing modal appends
Merge branch 'master' of github.com:Eventalist/Eventalist into theerickramer
fixed merge conflict
fixing subscriptions
Merge pull request #28 from Eventalist/tdshap

fixing subscriptions
whatever
did not modify
something
fixed merge conflicts
mailgun
Merge pull request #29 from Eventalist/theerickramer

Theerickramer
fixed merge conflicts
fixed merge conflict
send gun on the server
new user mailgun ajax call
Merge pull request #30 from Eventalist/theerickramer

new user mailgun ajax call