Cleaned inline styles
Merge branch 'master' of github.com:kcl-ddh/digipal

Conflicts:
	templates/pages/new-image-view.html