refs #369 part-1
Merge branch 'dev' of github.com:projestimate/projestimate into dev

Conflicts:
	app/models/wbs_activity.rb
	app/views/wbs_activities/_form.html.erb
	app/views/wbs_activities/index.html.erb
	config/routes.rb