Merge pull request #45 from lramsey/debugging

annotations ui
Fixed typo
Merge branch 'master' of https://github.com/klickr/klickr-chrome
Merge pull request #46 from jyek/master

Fixed typo in player
early work on disabling record button during play
Merge branch 'master' of https://github.com/klickr/klickr-chrome into debugging
change canRecord so that record button not shown during play