Merge branch 'master' of https://github.com/ualbertalib/DMPonline_v4

Conflicts:
	spec/plan.rb
updated editdeleteplan_spec.rb to check status after saving the changes
Merge branch 'master' of https://github.com/ualbertalib/DMPonline_v4