Update use of deprecated #update_attribute. Related to #460.
Make Company Directors go through the same pending -> active flow as other Organisation types.
Don't try to redeem invitations for already-active Members. Addresses #460.
Add age check to new director form. Closes #268.
Update tins.
Fix a failing migration when running on a v1.x DB.
Upgrade to Rails 3.2.17.
Merge remote-tracking branch 'origin/v1.x'

Conflicts:
	Gemfile.lock
Merge remote-tracking branch 'origin/master' into coop

Conflicts:
	Gemfile.lock
	features/step_definitions/director_steps.rb
	features/step_definitions/user_steps.rb
	lib/one_click_orgs/user_authentication.rb
	spec/views/members/index.html.haml_spec.rb
Merge branch 'coop-release' into oneclick-uk-coop