Conflict resolve

Signed-off-by: PATRICK IWANICKI <patrick@screengroove.com>
Merge branch 'patrick' of github.com:screengroove/CHECKOUT_1.5 into wilson