Merge pull request #1 from kerasai/7.x-1.x

adjusted header portion of page template
Added jQuery and NoConflict
Merge pull request #1 from CaffeinatedJim/7.x-1.x

Merging latest from CaffeinatedJim