Cleaned up legacy mergefiles
Merge branch 'develop' of https://github.com/JamesSullivan1/Consolidated-Calendar into develop