Update show.html.slim
Update zh.yml
Fix address issue.
Update show.html.slim
Merge branch 'master' of https://github.com/gazeldx/scrum
Update news body_en column type
Merge branch 'develop'
Update app/assets/images/slide01_en.jpg.
Update course show page.
Merge branch 'master' of github.com:gazeldx/scrum into develop

Conflicts:
	app/views/courses/show.html.slim
	db/schema.rb