#mg-33 work 15m
Merge branch 'develop' of https://github.com/KernelCorp/mygenetics into develop
spec 2.99
spec 3.x
mg-33 work 2h
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/controllers/site/news_controller.rb
	app/models/site/news.rb
	features/step_definitions/news_steps.rb
	spec/models/news_spec.rb