tmp wip
update grunt watch and enable livereload
Merge remote-tracking branch 'origin/master' into cal-annotations