Merge pull request #1 from ketancmaheshwari/master

update config and some apps
Merge pull request #1 from dongfangzhao/master

Merge pull request #1 from ketancmaheshwari/master