Changes from what we did for chw.
Merge branch 'development' of https://github.com/DataAnalyticsinStudentHands/VolunteerManagementApp into SHAPE

Conflicts:
	.idea/workspace.xml
Updated semantics.
Merge branch 'master' of https://github.com/DataAnalyticsinStudentHands/VMA-SHAPE into SHAPE

Conflicts:
	.idea/workspace.xml