Merge branch 'dev' of github.com:estimancy/projestimate into dev

Conflicts:
	app/views/views_widgets/_dashboard_views_widgets_results.html.erb
	db/schema.rb