probably I did something since last time...
Merge branch 'master' of https://github.com/GuillaumeMante/Hackathon2013IL

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