config refactoring finished close #91
merge resoved
order table updated, fixed some bugs with payment