Update the find-a-resource-template
Merge branch 'master' of https://github.com/CUL-DigitalServices/libraries-gateway into templates
Add a combined input/select component
Merge branch 'master' of https://github.com/CUL-DigitalServices/libraries-gateway into templates

Conflicts:
	public/less/base.less
Update static file path to point to the 'public' directory
Merge pull request #14 from timdegroote/templates

Update find-a-resource page to reflect the updated sketches
Updated paths in files to serve static files with Apache
Remove the local footer, add a border to global footer
Merge pull request #15 from Coenego/apache

Updated paths in templates to serve static files with Apache
Merge pull request #16 from timdegroote/remove-local-footer

Remove the local footer, add a border to global footer