News show
Merge branch 'dev' of github.com:kvakvs/erlanger_ru into dev

Conflicts:
	app/views/news/_column.html.erb