Move old form to a new location
New form almost done
New project setup
Create opportunities as needed
Merge branch 'master' into project_setup
Merge branch 'master' into project_setup
Merge branch 'master' into project_setup
Linking opportunity to new project setup
Merge branch 'master' into project_setup

Conflicts:
	app/views/projects/_form.html.erb
Merge branch 'master' into project_setup
Merge branch 'master' into project_setup

Conflicts:
	app/views/memberships/create.js.erb
Merge branch 'master' into project_setup