Attempting to merge
Merge remote-tracking branch 'origin/master'
Views changed to adapt to data core, POI edit view changed to reflect new structure; events either not saving or not saving  to proper day
Merge remote-tracking branch 'origin/master'
Fixed merge conflicts