Merge branch 'master' into gh-pages

Conflicts:
images/reclaimation/11.jpg
reclamationgallery.html