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

Conflicts:
	app/controllers/wbs_activities_controller.rb
	app/controllers/wbs_activity_elements_controller.rb
	app/views/wbs_activity_elements/show.html.erb
	db/schema.rb