add jquery
change tempalte, DELETE and PUT request
ignore DS_store
merge, and admin no more in cookie, but checked in token

Conflicts:
	app.js