Save estimation data for parent node after computing estimation data for child node refs:#723
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/views/users/_charts.html.erb
	config/routes.rb
Commit after conflict