Started upgrade to bootstrap 3
Merge branch 'master' of github.com:kcl-ddh/digipal

Conflicts:
	templates/admin/page/ScriptForm.html
	templates/digipal/folio_image.html
	templates/digipal/image_list.html
	templates/digipal/image_list_pagination.html
	templates/pages/graphs-list.html
	templates/pages/grid-view.html
	templates/pages/new-image-view.html
	templates/pages/record.html
	templates/pages/record_index.html
	templates/search/haystack/search.html
	templates/search/search_page_results.html