Design v3
bb
Merge branch 'master' of https://github.com/cgarnier/cul_de_chouette

Conflicts:
	hibernateconf/hibernate.cfg.xml