commited...
Merge branch 'Phase2_Activity1' of https://github.com/ali-raza-usu/004 into Phase2_Activity1

Conflicts:
	Phase 2/Activity
1/Code/coreApps.FTP.extended/bin/joinpointracker/MessageJoinPointTracker
.class
	Phase 2/Activity
1/Code/coreApps.WeatherSimulator.extended/bin/joinpointracker/MessageJoi
nPointTracker.class