updated trials controller
Merge branch 'master' of github.com:blounty/SwitchAB