modify for changing UI
Merge remote-tracking branch 'origin/master' into topic_improv_design

Conflicts:
	app/assets/javascripts/missions.js.coffee
	app/views/missions/_station_info.html.erb
Merge pull request #30 from ryotashiraishi/topic_improv_design

Topic improv design