added spec/editdeleteplan_spec.rb and methods to test edit and delete plan. Changed 'Set Password' page for invited user to have prompted helper and warning for password.
Merge branch 'master' of https://github.com/ualbertalib/DMPonline_v4

Conflicts:
	spec/plan.rb