tests on controllers
Merge branch 'master' into teststake2
Merge pull request #27 from ibarroladt/teststake2

Teststake2