Merge branch 'master' into migrate_ent_types

Conflicts:
	app/serializers/api/admin/enterprise_serializer.rb

spec/javascripts/application_spec.js

@@ -1,7 +1,6 @@
 //= require angular
 //= require angular-resource
 //= require angular-animate
-//= require angular-sanitize
 //= require angular-mocks
 //= require angular-cookies
 //= require angular-backstretch.js
@@ -9,6 +8,8 @@
 //= require lodash.underscore.js
 //= require angular-flash.min.js
 //= require shared/mm-foundation-tpls-0.2.2.min.js
+//= require textAngular.min.js
+//= require textAngular-sanitize.min.js
 //= require moment
 
 angular.module('templates', [])

spec/javascripts/unit/admin/enterprises/controllers/enterprise_controller_spec.js.coffee

@@ -4,9 +4,13 @@ describe "enterpriseCtrl", ->
   Enterprise = null
   PaymentMethods = null
   ShippingMethods = null
+  longDescriptionMock = ["long description text"]
 
   beforeEach ->
     module('admin.enterprises')
+    module ($provide)->
+      $provide.value "longDescription", longDescriptionMock
+      null
     Enterprise =
       enterprise:
         payment_method_ids: [ 1, 3 ]