Estimation Result: Effort per Phase & Profile
Graphical widget display refs:#798 and Resolving conflicts
Graphical widget display refs:#798 and Resolving conflicts
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/controllers/views_widgets_controller.rb
	config/locales/en-GB.yml
	config/locales/en.yml
	config/locales/fr.yml