Update about page (Halley)
Update contact page (HF)
Update gallery page (HF)
Add userSettings.js (unused?)
Fix conflicts