Add edit links to the template
Combine upload-page-js into upload-js
Delete thumb along with the picture
Merge branch 'master' of gelbman:blop