add counter
only serialise user if there is a user
eager load user and category
pg update
Merge branch 'develop' of github.com:wirelab/citytips into develop

Conflicts:
	app/views/tips/_tip.html.erb
	app/views/tips/_tip_handlebars.html.erb
Merge branch 'develop' of github.com:wirelab/citytips into develop