Merge branch 'develop'
this verison can run for soft-equnation, hard equation, frame, l1-normal, however area-sum is not correct
Merge branch 'master' into develop