Merge branch 'staging'
role concept
fixes

fixed 1
fix forms
fix forms
add id to customerUser
fix ability.rb
static assets
Revert "static assets"

This reverts commit 0d2ae56695d6c813fbb1c781fb436c6fa3010f2d.
language
split seeds
Merge branch 'master' into staging