Merge branch 'master' of https://github.com/waterbase/waterbase-app

Conflicts:
	README.md
initial API creation page
Merge branch 'database-manager' of https://github.com/waterbase/waterbase-app into database-manager

Conflicts:
	README.md
add resource editing functionality
Started writing services to make GET request to database for collections and documents
Merge branch 'database-manager' of https://github.com/waterbase/waterbase-app

Conflicts:
	README.md
Merge branch 'database-manager' of https://github.com/charosez/waterbase-app
Completed:

Initial front-end mock up with dummy data. Compeleted:
- Able to delete/add documents
- Able to switch between resources

Todo:

Waiting for backend to be hooked up
Update README.md
test skeleton. refactored restful api creation
Update README.md

Typo
adds dyanmic list view for db manager
refactored server generation
schema generation and virtual for id
created serversManager to manage all server instances. servers api use serversManager instead.
schema generation and virtual for id
add structure for socket server
test cases for user and session. refined all responses to give meaningful status codes and content
refactored generated controllers to two layers for code sharing with sockets. created api design for custom database management
work on socket server