added all cms spec test again since it all works fine
Initiate error text as empty.
changed ruby back to 2.1.0 since it all works now again, also changed submodule to point to OceanFront organization repo for the rework of admin-clients update
Merge remote-tracking branch 'upstream/master'
updated OF framework
Upgraded to Rails 4.1.2 (from Rails 4.1.1).
Added RSpec 3 compat.
made change to cms to fire search at setVisible when app and context is filled in
added latest oceanfront and cleaned up common.css to adhere to new oceanfront.css
merged upstream and bundle update
bundle update and fix to content.js