Modification lettre et génération JSON
Merge branch 'master' of https://github.com/fitzlucassen/hackathon21112014

Conflicts:
	Logs/log.txt
	Website/Content/Js/draggable.js