fix tips category display
Merge remote-tracking branch 'origin/master'

Conflicts:
	pro_tips/apps/main_sites/templates/sites/tips.html