Modified city name & current time
Merge branch 'master' into modify_#90

Conflicts:
	app/views/tour/search.html.erb
Modified current time
Merge pull request #106 from tnumata3632/modify_#90

都市名改善、今の時間を表示