no change
Merge branch 'nathan_devise_omni'
need to add omnicontroll spec
should be succesfully merged