updated associations
fixed merge
Merge pull request #26 from Eventalist/tdshap

Tdshap
Merge branch 'master' of github.com:Eventalist/Eventalist into theerickramer
Merge pull request #27 from Eventalist/tdshap

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

fixing subscriptions
whatever
something
mailgun
Merge pull request #29 from Eventalist/theerickramer

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

new user mailgun ajax call
Merge branch 'master' of github.com:Eventalist/Eventalist into tdshap
server changes