mg-33 work 2h
Merge branch 'master' of https://github.com/KernelCorp/mygenetics

Conflicts:
	app/models/site/news.rb
	config/routes.rb
Merge remote-tracking branch 'origin/master'