added static pages for member, changes edit form
Fixed calendar
Merge pull request #23 from cenderin/master

added static pages for member, changes edit form
ds store
merge conflicts exist
fixed merge conflicts
got slideshow working
fixed merge conflicts