111113 branch
application commit
Merge remote-tracking branch 'origin/master' into 1113

* origin/master:
  360,kb,video
  Initial commit