Using separate User and Admin models. Made the basic roles and Cancan abilities but not the more specific rules for staff and supervisor.
Defined abilities for staff and supervisors. Added some test data to demonstrate these.
Now displaying google maps on Desa index page with markers for each desa.
Desas index now has google map showing all the desas as markers and with a pop up div when you click them.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.rvmrc
	Gemfile
	Gemfile.lock
	app/controllers/fish_controller.rb
	app/controllers/home_controller.rb
	app/controllers/landings_controller.rb
	app/controllers/surveys_controller.rb
	app/models/desa.rb
	app/models/fish.rb
	app/models/survey.rb
	app/views/desas/index.html.erb
	app/views/home/index.html.erb
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb
	db/seeds.rb
Moved around google maps js so that it's not interfering with graphs.
Made generic chart rendering method and moved user surverys chart to show user view.
Added logic for fisheries chart and moved it to show fisheries view.
Added length frequency chart to fisheries show view.
Rremoved graphs from old views.
Added date range to fisheries length frequency chart.
Added public graph data to user profile and fishery profile. Added office to user and updated abilities.
Changed staff and supervisors to admin. Created admins section. Moved charts back to fisheries and admins views. Reworked cancan abilities.
merges commits from Richard
fixes database.yml
updates rvmc
further update rvmc
merges admin model, including adding avatar, registration routes, view conditionals
adds gmaps4rails
moves javascripts to vendors, updates desa seeds, modifies graphed shows