add the Usertest
Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/rlopez0689/ECP2.Rodrigo.Lopez.git into develop