Code for synching
Merge branch 'coconut-clinic' of https://github.com/mikeymckay/coconut into coconut-clinic

Conflicts:
	_attachments/views/QuestionView.coffee
	_attachments/views/QuestionView.js