Merge branch 'master' of https://bitbucket.org/jeremTest/testproject
Merge branch 'master' of https://github.com/jeremieca/TestServerCI