Release5

Merging the Release5 code to the master branch.

Detail Release plan is available on http://kanban.navigosgroup.com:8080/icescrum/p/TECHLOOPER#timeline