need to debug ATEAM
Merge branch 'master' of https://github.com/nh295/CSER_2015

Conflicts:
	java/src/madkitdemo3/ATeamsManager.java
Trying to debug Ateams
Merge branch 'master' of https://github.com/nh295/CSER_2015

Conflicts:
	java/src/madkitdemo3/ATeamsManager.java
Added kill method to manager. Agents were not 'dying' properly and were causing concurrent exceptions