syncing repo before merge
Merge branch 'master' of github.com:anryl/shooteru_HTC