modified:   backend/src/aminerdata.cpp
	modified:   backend/src/aminerdata.hpp
Merge branch 'master' of https://github.com/dahui1/saedemo