Merge commit '768c7895f0c1b341c24065d76ebda8f1b9ec559f'

Conflicts:
	Gemfile
	Gemfile.lock
	Panorama.war
	app/helpers/env_helper.rb
	app/views/active_session_history/_list_session_statistics_historic_grouping_table_def.html.erb
	config/environments/production.rb