Activator Bugfixes. Working with @picrin
Merge branch 'dev' of github.com:brunomperes/TeamE-semester2 into dev