Merge pull request #22 from cenderin/master

STUFF HAPPENED
Tested all profile controller actions
improvements to the about page
Made calendar route action and view
Merge remote-tracking branch 'upstream/master'
slideshow
fixed mege conflicts
Fixed calendar
delete jquery head call
Merge pull request #23 from cenderin/master

added static pages for member, changes edit form
merge conflicts exist
added lots