Merge branch 'custom-api'
Merge branch 'master' of https://github.com/waterbase/waterbase-app
Merge branch 'master' of https://github.com/waterbase/waterbase-app
Merge branch 'master' of https://github.com/waterbase/waterbase-app
redirect to dashboard view when creating new api, remove port input, rename hackathonApp, testController, and APIception