changes for annotation library; fixed json error responses
Merge branch 'master' of https://github.com/QutBioacoustics/baw-server

Conflicts:
	app/controllers/audio_events_controller.rb