- Fix: form check on step 2. Before, it was possible to continue without filling out the form
- Proposals are being removed if going to step 4
- Step 5 and 6 now properly named to step 4 en 5
Merge origin/master

Conflicts:
	www/js/controllers.js