News views
Merge branch 'salma'

Conflicts:
	module/Application/view/application/news/show.phtml