Merge branch 'master' of https://github.com/coriger/supr.git
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/admin/model/add_ModelDataUnit.jsp
	src/main/webapp/WEB-INF/admin/model/list_modelDataUnit.jsp
	src/main/webapp/WEB-INF/classes/com/supr/blog/controller/model/ModelController.class
	src/main/webapp/WEB-INF/classes/com/supr/blog/controller/model/ModelDataUnitController.class
	src/main/webapp/WEB-INF/classes/com/supr/blog/mapper/ModelMapper.class
	src/main/webapp/WEB-INF/classes/com/supr/blog/service/ModelService.class
	src/main/webapp/WEB-INF/classes/com/supr/blog/service/impl/ModelServiceImpl.class
	src/main/webapp/WEB-INF/classes/mybatis/ModelMapper.xml