Merge branch 'master' of https://github.com/waterbase/waterbase-app into dashboard-view
additional UI tweaks
Merge branch 'master' of https://github.com/waterbase/waterbase-app
Merge branch 'dashboard-view'
Merge branch 'master' of https://github.com/waterbase/waterbase-app
Merge branch 'database-manager' of https://github.com/waterbase/waterbase-app into general-ui

Conflicts:
	app/styles/custom.css
	app/views/partials/dashboard.html
apply unified  UI across all pages
database manager UI redesign
Merge branch 'general-ui' of https://github.com/waterbase/waterbase-app into database-manager

Conflicts:
	app/styles/custom.css
	app/views/partials/newapi.html
UI merge changes