Merge branch 'master' into annotation_discussions

Conflicts:
	Gemfile.lock
	app/models/audio_event.rb
	app/models/user.rb
	config/routes.rb
	spec/acceptance/audio_events_spec.rb
	spec/routing/devise_routing_spec.rb
	spec/routing/media_routing_spec.rb
	spec/routing/permissions_routing_spec.rb
	spec/routing/taggings_routing_spec.rb
Added acts_as_paranoid, fixed associations
Disabled route_check
Added audio_event_comment_factory, more model tests
updated audio event comments controller
Merge branch 'annotation_discussions' of github.com:QutBioacoustics/baw-server into annotation_discussions

Conflicts:
	app/models/audio_event.rb
	config/routes.rb
	spec/acceptance/audio_events_spec.rb
	spec/routing/permissions_routing_spec.rb