cal incre commit. redesigning querying, refactoring views_events
Merge branch 'master' of github.com:PrincetonUSG/USG-srv-dev