fix routing
merge with upstream remote
merge with master
Merge branch 'develop' of github.com:romain-grelet/bamboo-project into feature/mah-listProjects