new_tip view(desktop only)
Merge branch 'develop' of github.com:wirelab/citytips into develop

Conflicts:
	config/routes.rb