Merge pull request #25 from RaphaelTurtlePower/second_merge

Merging all three branches
set address properly for event
added end date/time persistence
Merge pull request #34 from RaphaelTurtlePower/master

Merging master into second_merge.