renamed heroku
Merge branch 'master' of https://github.com/koroket/MKSTFA

Conflicts:
	TFE/SettingsViewController.m