Update 2014-11-05-event-077.markdown
Merge branch '1335-mrt-k' into source

Conflicts:
	_posts/2014-11-05-event-077.markdown