Merge branch 'master' of https://github.com/phlip9/calnected

Conflicts:
static/js/app.jsx