rm blank line
Merge branch 'master' of http://github.com/KernelCorp/mygenetics

Conflicts:
	app/models/report.rb
some config
Merge remote-tracking branch 'origin/master'