test skeleton. refactored restful api creation
refactored server generation
Merge branch 'api' of https://github.com/wjmao88/waterbase-app into sockjs-api

* 'api' of https://github.com/wjmao88/waterbase-app:
  refactored server generation
  test skeleton. refactored restful api creation

Conflicts:
	app/scripts/services/api.js
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
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
refactored generated controllers to two layers for code sharing with sockets. created api design for custom database management
Merge branch 'master' of https://github.com/waterbase/waterbase-app

Conflicts:
	README.md
Merge branch 'api'
Merge pull request #6 from wjmao88/master

complete custom server generation, management and routing
Merge branch 'server-api-sockets' of https://github.com/waterbase/waterbase-app into server-api-sockets

* 'server-api-sockets' of https://github.com/waterbase/waterbase-app:
  refactored generated controllers to two layers for code sharing with sockets. created api design for custom database management
  test cases for user and session. refined all responses to give meaningful status codes and content
  adds GA snippet and README.md
  schema generation and virtual for id
  created serversManager to manage all server instances. servers api use serversManager instead.
  schema generation and virtual for id

Conflicts:
	README.md
	package.json
work on socket server
fixes controller in routes for server generation
adds more to createServer
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
completes initial implementation of sockets