Deleting wishes works, started work on editing wishes
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/app/components/factories.js
	public/app/view3/view3.js
	server/model/wish.js
	server/routes/REST_Admin_API.js