Merge branch 'master' of C:\SLIIT\4th YR\Semester1\Research\smart-sms with conflicts.
Contact Response (on going)
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/pom.xml