• Conflicts:
    	js/App.js
    	js/brandStore/BrandStore.js
    	js/brandStore/constants/actionTypes.js
    	js/brandStore/containers/BrandStoreContainer.js
    	js/brandStore/reducers/brandStore/brandStoreActions.js
    	js/brandStore/reducers/brandStore/brandStoreInitialState.js
    	js/brandStore/reducers/brandStore/brandStoreReducer.js
    	js/brandStore/services/BrandStoreService.js
    	js/coupon/reducers/coupon/couponActions.js
    by 于良
     
    Browse Files