Clean Teaser, improved URL-converting
Merge remote-tracking branch 'origin/master'

* origin/master:
  Delete my_settings.ini