Bug fixing and small design changes
Merge branch 'master' of github.com:kcl-ddh/digipal

Conflicts:
	templates/digipal/image_list.html