Updated app to work in couchdb and cloudant. flatten all files.

Lost edit and delete buttons when diplaying items, but got them to pull
from json data on couch db insted of from json.js file.
Merge branch 'master' into gh-pages

Conflicts:
	.DS_Store