Merge pull request #40 from coryasato/master

fixed routing
Events View DB Complete