Revert "meged my two branches from git hub and appro"

This reverts commit 1c9f1d470d3241503080d8f56eac8ff3816c32e4.
meged my two branches from git hub and appro