Add a full_title helper
Added contact page to track.
Fix merge conflicts. Update test files.
Update angela branch.