去除turblinks影响
图片样式修改
Merge branch 'cjw' into dev

Conflicts:
	app/views/travel_images/index.html.slim