Merge branch 'dev' of https://github.com/Involve-Seattle/Activity-Calendar into dev
Merge branch 'master' of https://github.com/Involve-Seattle/Activity-Calendar into dev
clean up
cache events from API
Merge branch 'master' of https://github.com/Involve-Seattle/Activity-Calendar into eventsdb
Merge branch 'dev' of https://github.com/Involve-Seattle/Activity-Calendar into eventsdb
Merge pull request #12 from Involve-Seattle/eventsdb

Eventsdb
merge
users are being added to database
re-added jwt-simple to package.json
Merge branch 'dev' of https://github.com/Involve-Seattle/Activity-Calendar into dev
Merge branch 'templates' of https://github.com/Involve-Seattle/Activity-Calendar into templates
better data scraping, event views
added jwt_auth and passport files, added base64 to mymeets test, added more files to jshint and jscs in gruntfile, clean and passes tests
moved logic out of login controller into user services
refactored login controller and user service
more refactoring and added logout to user service
Merge pull request #14 from Involve-Seattle/apilogic

Apilogic
templates/dev merge
Merge branch 'templates' into dev