pulling from eric bug fix
fixed merge conflict
merge fix
category filter working
Merge pull request #41 from Eventalist/yoshiemuranaka

Yoshiemuranaka