fixed cluster map
Info windows -- dummy text
Merge branch 'master' of https://github.com/dvdhsu/tripplanr
updated jquery checkbox loop-through
Merge branch 'master' of https://github.com/dvdhsu/tripplanr

Conflicts:
	app/views/cities/show.html.erb
add missing quote
Merge branch 'master' of https://github.com/dvdhsu/tripplanr