Merge branch 'master' into develop
Remove js url for test environmnent

If the js is unreachable, it increases tests running time (3mn vs 5s)
Use capybara instead of capybara-webkit
Fix tests so it works with capybara
Merge branch 'develop'