ksoap2
Merge branch 'master' of https://github.com/MarkFouche/cos301_2014_g6

Conflicts:
	SquirrelMarking/bin/jarlist.cache