Merge remote-tracking branch tansaku/master into

using-cancan to continue development on recent codebase.

Conflicts:
	Gemfile.lock
	app/controllers/organizations_controller.rb
	spec/controllers/organizations_controller_spec.rb