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
Able to edit by row and switch resources by tab
Merge branch 'master' of https://github.com/waterbase/waterbase-app

Conflicts:
	README.md
	app/styles/custom.css
minor changes
Merge branch 'master' of https://github.com/waterbase/waterbase-app
Merge branch 'database-manager' into database-manager-f1
First working commit
working on requestServices
Able to edit documents
Changed updateDocument in customDatabase status code from 201 to 200
Completed:

1. Ability to RESTfully add and delete documents

Changed:

In customDatabase, we can only create, update only one document at a time.
Changed requestServices to factory from service
Minor changes