conflic
kk
lll
Merge remote-tracking branch 'origin/master'

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	build/classes/com/openthinks/los/account/Account.class
	build/classes/com/openthinks/los/account/OrderTask.class
	build/classes/com/openthinks/los/account/Role.class
	build/classes/com/openthinks/los/account/dao/AccountDao.class
	build/classes/com/openthinks/los/account/dao/OrderTaskDao.class
	build/classes/com/openthinks/los/account/dao/impl/AccountDaoJpaImpl.class
	build/classes/com/openthinks/los/account/dao/impl/OrderTaskDaoJpaImpl.class
	build/classes/com/openthinks/los/account/rest/AccountController.class
	build/classes/com/openthinks/los/account/service/AccountService.class
	build/classes/com/openthinks/los/account/service/impl/AccountServiceImpl.class
	build/classes/com/openthinks/los/interceptor/AuthenticationInterceptor.class
	build/classes/com/openthinks/los/message/Message.class
	build/classes/com/openthinks/los/message/dao/MessageDao.class
	build/classes/com/openthinks/los/message/dao/impl/MessageDaoJpaImpl.class
	build/classes/com/openthinks/los/order/OrderForm.class
	build/classes/com/openthinks/los/order/OrderModel.class
	build/classes/com/openthinks/los/order/dao/OrderDao.class
	build/classes/com/openthinks/los/order/rest/OrderController.class
	build/classes/com/openthinks/los/order/service/OrderService.class
	build/classes/com/openthinks/los/product/Brand.class
	build/classes/com/openthinks/los/product/Category.class
	build/classes/com/openthinks/los/product/Color.class
	build/classes/com/openthinks/los/product/ColorSizesComposition.class
	build/classes/com/openthinks/los/product/Product.class
	build/classes/com/openthinks/los/product/ProductResult.class
	build/classes/com/openthinks/los/product/QueryParameters.class
	build/classes/com/openthinks/los/product/Season.class
	build/classes/com/openthinks/los/product/Series.class
	build/classes/com/openthinks/los/product/SimplifiedProduct.class
	build/classes/com/openthinks/los/product/Size.class
	build/classes/com/openthinks/los/product/Style.class
	build/classes/com/openthinks/los/product/dao/BrandDao.class
	build/classes/com/openthinks/los/product/dao/CategoryDao.class
	build/classes/com/openthinks/los/product/dao/ColorDao.class
	build/classes/com/openthinks/los/product/dao/ColorSizesCompositionDao.class
	build/classes/com/openthinks/los/product/dao/ProductDao.class
	build/classes/com/openthinks/los/product/dao/SeasonDao.class
	build/classes/com/openthinks/los/product/dao/SeriesDao.class
	build/classes/com/openthinks/los/product/dao/SimplifiedProductDao.class
	build/classes/com/openthinks/los/product/dao/SizeDao.class
	build/classes/com/openthinks/los/product/dao/StyleDao.class
	build/classes/com/openthinks/los/product/rest/BrandController.class
	build/classes/com/openthinks/los/product/rest/CategoryController.class
	build/classes/com/openthinks/los/product/rest/ColorController.class
	build/classes/com/openthinks/los/product/rest/ExcelController.class
	build/classes/com/openthinks/los/product/rest/LackEssentialColException.class
	build/classes/com/openthinks/los/product/rest/ProductController.class
	build/classes/com/openthinks/los/product/rest/ProductFindController.class
	build/classes/com/openthinks/los/product/rest/RankController.class
	build/classes/com/openthinks/los/product/rest/SeasonController.class
	build/classes/com/openthinks/los/product/rest/SeriesController.class
	build/classes/com/openthinks/los/product/rest/SimplyQuery.class
	build/classes/com/openthinks/los/product/rest/SizeController.class
	build/classes/com/openthinks/los/product/rest/StyleController.class
	build/classes/com/openthinks/los/product/service/BrandService.class
	build/classes/com/openthinks/los/product/service/CategoryService.class
	build/classes/com/openthinks/los/product/service/ColorService.class
	build/classes/com/openthinks/los/product/service/ProductService.class
	build/classes/com/openthinks/los/product/service/SeasonService.class
	build/classes/com/openthinks/los/product/service/SeriesService.class
	build/classes/com/openthinks/los/product/service/SimplifiedProductService.class
	build/classes/com/openthinks/los/product/service/SizeService.class
	build/classes/com/openthinks/los/product/service/StyleService.class
	build/classes/com/openthinks/los/report/BrandBigtypeReport.class
	build/classes/com/openthinks/los/report/BrandBigtypeReportItem.class
	build/classes/com/openthinks/los/report/BrandReport.class
	build/classes/com/openthinks/los/report/BrandReportItem.class
	build/classes/com/openthinks/los/report/CategoryReport.class
	build/classes/com/openthinks/los/report/CategoryReportItem.class
	build/classes/com/openthinks/los/report/ColorReport.class
	build/classes/com/openthinks/los/report/ColorReportItem.class
	build/classes/com/openthinks/los/report/DeliveryTimeReport.class
	build/classes/com/openthinks/los/report/DeliveryTimeReportItem.class
	build/classes/com/openthinks/los/report/IntegrationReport.class
	build/classes/com/openthinks/los/report/ModelReportByAccount.class
	build/classes/com/openthinks/los/report/ModelReportByAccountItem.class
	build/classes/com/openthinks/los/report/QuantityByCategory.class
	build/classes/com/openthinks/los/report/SeasonCategoryReport.class
	build/classes/com/openthinks/los/report/SeasonCategoryReportItem.class
	build/classes/com/openthinks/los/report/SeasonReport.class
	build/classes/com/openthinks/los/report/SeasonReportItem.class
	build/classes/com/openthinks/los/report/SeriesReport.class
	build/classes/com/openthinks/los/report/SeriesReportItem.class
	build/classes/com/openthinks/los/report/SizeReport.class
	build/classes/com/openthinks/los/report/SizeReportItem.class
	build/classes/com/openthinks/los/report/StructureReport.class
	build/classes/com/openthinks/los/report/StyleReport.class
	build/classes/com/openthinks/los/report/StyleReportItem.class
	build/classes/com/openthinks/los/report/dao/CategoryReportDao.class
	build/classes/com/openthinks/los/report/dao/ColorReportDao.class
	build/classes/com/openthinks/los/report/dao/ModelReportDao.class
	build/classes/com/openthinks/los/report/dao/ReportDao.class
	build/classes/com/openthinks/los/report/dao/SeasonReportDao.class
	build/classes/com/openthinks/los/report/dao/SeriesReportDao.class
	build/classes/com/openthinks/los/report/dao/SizeReportDao.class
	build/classes/com/openthinks/los/report/dao/StyleReportDao.class
	build/classes/com/openthinks/los/report/rest/Candidate.class
	build/classes/com/openthinks/los/report/rest/CategoryReportController.class
	build/classes/com/openthinks/los/report/rest/ColorReportController.class
	build/classes/com/openthinks/los/report/rest/ModelReportController.class
	build/classes/com/openthinks/los/report/rest/ReportController.class
	build/classes/com/openthinks/los/report/rest/SeasonReportController.class
	build/classes/com/openthinks/los/report/rest/SeriesReportController.class
	build/classes/com/openthinks/los/report/rest/SizeReportController.class
	build/classes/com/openthinks/los/report/rest/StyleReportController.class
	build/classes/com/openthinks/los/report/service/CategoryReportService.class
	build/classes/com/openthinks/los/report/service/ColorReportService.class
	build/classes/com/openthinks/los/report/service/ModelReportService.class
	build/classes/com/openthinks/los/report/service/ReportService.class
	build/classes/com/openthinks/los/report/service/SeasonReportService.class
	build/classes/com/openthinks/los/report/service/SeriesReportService.class
	build/classes/com/openthinks/los/report/service/SizeReportService.class
	build/classes/com/openthinks/los/report/service/StyleReportService.class
	build/classes/com/openthinks/los/rest/GenericRestfulController.class
	build/classes/com/openthinks/los/rest/GenericRestfulQueryController.class
	build/classes/com/openthinks/los/rest/Message.class
	build/classes/com/openthinks/los/rest/SignController.class
	build/classes/com/openthinks/los/system/InitializationListener.class
	build/classes/com/openthinks/los/system/InitiateServlet.class
	build/classes/com/openthinks/los/system/SystemConstant.class
	build/classes/com/openthinks/los/system/configuration/InputRememberConfigReader.class
	build/classes/com/openthinks/los/system/configuration/InputRememberItem.class
	build/classes/com/openthinks/los/system/configuration/InputRememberXmlParser.class
	build/classes/com/openthinks/los/system/configuration/PropertiesReader.class
	build/classes/com/openthinks/los/system/configuration/SendingAccount.class
	build/classes/com/openthinks/los/system/configuration/SendingServer.class
	build/classes/com/openthinks/los/util/ConfigReader.class
	build/classes/com/openthinks/los/util/MemoryClass.class
	build/classes/com/openthinks/los/util/Page.class
	build/classes/com/openthinks/los/util/Pages.class