Revert "ProposalManager"

This reverts commit 1fb4857118454960c23e28f25acf562550b8a675.
gitignore
"application.conf"
Merge branch 'master' of https://github.com/sdefauw/CarPooling

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/sdefauw/CarPooling

Conflicts:
	carpooling/app/controllers/ProposalManager.java
Matching ajoute, pas termine
Merge branch 'master' of https://github.com/sdefauw/CarPooling
Merge branch 'gui' of https://github.com/sdefauw/CarPooling
FORM ok1