Deleted test target
Merge remote-tracking branch 'origin/master'
Changed name of default controllers