active state on button and bug fix
Merge branch 'develop' of github.com:wirelab/citytips into develop