Merge pull request #45 from AECC-UPRB/master

Master
fixed survey mixin
Merge pull request #46 from AECC-UPRB/hotfix-survey

fixed survey mixin
Merge branch 'devbranch' of https://github.com/AECC-UPRB/aecc into devbranch
Merge branch 'devbranch'