added about, contact, resources, and lib.php changes
Merge branch 'jordan'

merging with local branch