Merge branch 'master' of https://github.com/teheavy/AMA3D

Conflicts:
	agent.py
Merge branch 'master' of https://github.com/teheavy/AMA3D
Merge branch 'master' of https://github.com/teheavy/AMA3D
Merge branch 'master' of https://github.com/teheavy/AMA3D
Deleted comment