[sprint 36.2] texts...
Merge branch 'master' of github.com:limtrack/urban