Proposal: POSESS OK, DESIGN KO ;)
Merge branch 'master' of https://github.com/sdefauw/CarPooling

Conflicts:
	carpooling/app/controllers/ProposalManager.java
DB OK: /!\ IL FAUT RECREER TT LA DB