FORM + Proposal (maps ok and form)
Object modified
Object add fct
Itin fit added
Merge branch 'master' of https://github.com/sdefauw/CarPooling

Conflicts:
	carpooling/app/controllers/ProposalManager.java
	carpooling/app/models/objects/Proposal.java