combined us40612 and us40613 into one branch, changed name conventions for current develop and removed unnecesary stuff
changed default route of routerConfig to ViewDefault object