Merge branch 'develop' into calendar-debug
Fixed plugin page generation
Fixes bug for adding friends
Small fix
Fix 'What did you say?'
Fix always-disco
Another script update to fix some more bugs.
Merge pull request #385 from lring/develop

Fixed plugin page generation and a few other bugs in nutrition.
Merge branch 'develop' of https://github.com/always-on/always into develop
Merge pull request #384 from mbehrooz/calendar-debug

Fixes asking friends for events
incremental consistency
Behavior.addNull()
Disable repeating events
Disable event locations
Disable event durations
Remove Shore libs
Remove Shore libs
Merge remote-tracking branch 'upstream/develop' into develop