Merge branch 'master' of E:\Boulot\TELECOMNancy 2013\Hackathon\Hackathon2013IL with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	white-terra-413/bdd.pyc
	white-terra-413/roadtrip.pyc
fin api outpost.travel ça marchouille...