Merge branch 'origin/gh-pages'
Merge branch 'origin/gh-pages'
Removed extra delete item functions.
Got edit item working (except changing html of add ttem button.
Added additional nav for ajax loading.
Added JSON and xml data pages
Merge branch 'gh-pages'
Merge branch 'origin/master'