Added tenplate for in_city slots.
Merge branch 'cities'
Merge branch 'master' into cities