added basecontroller
Merge branch 'develop'