Fix logout bug
Resolve gemfile conflicts

Conflicts:
	Gemfile
	Gemfile.lock
Gemfile update - 'bundle update'
Fix extra arrows on PoT chart. Added actions/resource tooltips!
Bug fixes: Session filter, time dragger scale change
Merge branch 'dev'