update
Merge branch 'master' of github.com:mouda/Steven into HEAD

Conflicts:
	configure
Merge branch 'master' of github.com:mouda/Steven into HEAD

Conflicts:
	configure
	schedule/CORRE_MA_OPE.cpp
	schedule/CORRE_MA_OPE.h
update