Tagline fixes
Tags and partners
Merge branch 'master' of github.com:trentio/urbanambassadors

Conflicts:
	src/main/scala/Routes.scala