Implemented cancan permissions on memberships controller and modified user membership form accordingly - closing #303 but still needs some work
Merge branch 'master' of github.com:concerto/concerto

* 'master' of github.com:concerto/concerto:
  Fix new content page error and keep a constant tab order