Use the system's username instead of the sample username in controlapp
Merge branch 'master' of https://github.com/weblabdeusto/weblabdeusto