Merge pull request #1 from CelineMartinetSanchez/artist

Artist
Add User roles with AR Enum assoc. with Pundit gem
rails 4.1.0
Merge branch 'sti_on_users' of https://github.com/CelineMartinetSanchez/baobab into artwork

Conflicts:
	baobab/Gemfile.lock
	baobab/app/controllers/application_controller.rb
	baobab/app/views/layouts/application.html.erb
	baobab/db/schema.rb
Merge pull request #5 from CelineMartinetSanchez/artwork

Artwork
customers
Merge branch 'customers' into develop

Conflicts:
	baobab/app/models/organization.rb
	baobab/app/views/layouts/_header.html.erb
	baobab/app/views/organizations/dashboard.html.erb
	baobab/config/routes.rb
	baobab/db/schema.rb
Merge branch 'master' into develop
wtf
Merge branch 'master' into develop

Conflicts:
	baobab/app/controllers/application_controller.rb
	baobab/app/models/user.rb
	baobab/db/schema.rb
No need for this