some minor changes in views
Merge branch 'master' of github.com:lepsplet/cms_light

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