Synchronization with the version on hitssv106
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/roguenarok_controller.rb
	app/models/lsi_analysis.rb
	app/models/pruning.rb
	app/models/result_files_parser.rb
	app/models/rogue_taxa_analysis.rb
	app/models/roguenarok.rb
	app/models/tii_analysis.rb
	app/views/roguenarok/work.html.erb
	lib/send_message.rb
	public/index.html
	public/stylesheets/roguenarok.css