commitlol
good commit
Merge branch 'master' of https://github.com/GuillaumeMante/Hackathon2013IL

Conflicts:
	white-terra-413/templates/new_etape.html