Merge branch 'master', remote-tracking branch 'origin' into UI_DEV
New stuff
UI : Working example
Merge branch 'UI_DEV', remote-tracking branch 'origin'