https://www.pivotaltracker.com/story/show/49027649
Merge branch 'dev_town_dropdown_49027649' into develop