[28082014] - Thien gitignore
[28082014] - Thien modify DB before continue
[29082014] - Thien commit modify admin page
[29082014] - Thien commit before bs pull
Merge branch 'master' into bs135
modify localWeb.config
BS_140830 fix bug for customer feedback 28/08