categories are an association now
Merge branch 'develop' of github.com:wirelab/citytips into develop