sync
Merge branch 'master' of https://github.com/payyng/Payy

Conflicts:
	MPIAPI/mpiapi.cpp