removed extra main controller
Merge branch 'myDev'