why
Merge branch 'master' of github.com:Eventalist/Eventalist into theerickramer
ok
fixed merge conflicts
fixed app merge conflicts
pre subscriptions
Merge pull request #38 from Eventalist/yoshiemuranaka

Yoshiemuranaka
subscriptions fixed merge
Merge branch 'master' of github.com:Eventalist/Eventalist into theerickramer
Merge pull request #39 from Eventalist/yoshiemuranaka

added _blank
Merge branch 'master' of github.com:Eventalist/Eventalist into theerickramer
fixed subscribe
Merge pull request #40 from Eventalist/theerickramer

Theerickramer
pulling from eric bug fix
fixed merge conflict
merge fix
category filter working