Merge branch 'master-qa' into cdominguez
Fix initScope conflic
Merge branch 'cdominguez' into master-qa
Merge pull request #8 from proyecto4-tecdroid/master-qa

Fix initScope Conflict