Work on AJAX form for adding/editing video annotations
Merge branch 'videolectures' of github.com:grahamcracker/grapefruit into videolectures

Conflicts:
	app/views/video_texts/_edit_video_text.html.erb