text fix2
fix css
Merge remote-tracking branch 'origin/master'
Merge branch 'develop'
fix after merge
fix routes and double render error
refactoring and fix routes
fix routes
Fixes in news_steps.
Added factory news
Merge branch 'develop'
Merge remote-tracking branch 'origin/master'
merge develop
preview as text
mg-33 work 2h
Changed factory news.
Added news controller spec
fix paths
After merge
per page 10
slug for news
Merge branch 'master' of https://github.com/KernelCorp/mygenetics

Conflicts:
	app/models/site/news.rb
	config/routes.rb