Refactoring
Merge branch 'WS' of https://github.com/loclamor/nuit2013
Merge branch 'master' of https://github.com/loclamor/nuit2013