FORM + Proposal
Merge branch 'gui' of https://github.com/sdefauw/CarPooling

Conflicts:
	carpooling/app/controllers/Field.java
	carpooling/app/controllers/FormUI.java