Merged some design features
Merge branch 'fantin3' of https://bitbucket.org/adrientoub/nuit-de-linfo-2014