watch demo files
demoApp.js cleanup
use bower for prettify
Merge remote-tracking branch 'origin/master' into cal-annotations

Conflicts:
	doc/js/demoApp.js
overlap test
group annotations by week
factor out annotations positioning