remove not needed code
Shortcat -> Shortcut
Merge branch 'master' into multiupload

* master:
  Shortcat -> Shortcut
  remove not needed code