2.2 release, ui tests update
Merge pull request #193 from baptistelebail/master

2.2 release, ui tests update