Add also a base viewController
Merge branch 'refs/heads/dev'