Merge branch 'feature/pool151_predict_calculate' into debug

# Conflicts:
#	models/edb_data_table.go
#	routers/router.go
#	utils/constants.go