del
up
Fixes
Form submission finished
upload folder readd
edit a landmark
edit landmark
Merge branch 'master' into redhook_staticcontent

Conflicts:
	app/index.html
	app/partials/landmark-list.html