Merge remote-tracking branch 'evan/master'

Conflicts:
	app/views/venues/show.html.erb
workaround for jQuery tokeninput on Korean characters
fixed tokeninput prepopulate syntax