Merge branch 'master' of https://github.com/esadhar/onsegit2014

Signed-off-by: nicolastretout <nicolombien93@hotmail.com>
Merge branch 'master' of https://github.com/esadhar/onsegit2014