Start work on observation editing
Merge branch 'icewatch_2_0' into add_assist

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/cruises_controller.rb
	app/helpers/cruises_helper.rb
Add all form elements
Add select2
update observation editing views
Merge pull request #22 from gina-alaska/add_assist

Add assist