Data constraints and design choices
Merge branch 'master' of https://github.com/Ouikka/dbs-2014

Conflicts:
	rendu1/report/dbs-deliverable1.pdf