fix for null dates in shape file export
Merge branch 'actvity_info' into develop