Began merging in Kevin's stuff
Merged in Kevin's EditPost and DateActivity code