add gitignore
Merge branch 'master' into bs135
modify localWeb.config
BS_140830 fix bug for customer feedback 28/08
Merge remote-tracking branch 'mooc/bs135'