Merge branch 'master' of https://github.com/whittenjaw85/pysimiam into test
Updated the parameters XML schema, and the parsing of it.
First iteration of supervisor/controller.\nAbstracted the notion of inputs/outputs.\nAdded parameters and parameter structures
Merge branch 'test' of github.com:whittenjaw85/pysimiam
Added background polygons (markers, not obstacles) to the world
UI control of supervisor parameters
Added exceptions to abstract Renderer methods
Implemented drawing lines in QtRenderer
Added a path SimObject
Added trackers to every robot
Now allowing int values in parameters
Fixed dockwindow creation on rewind (needs more work)
Fun with two robots
Returning robot type from xml parser.
Merge branch 'master' of https://github.com/whittenjaw85/pysimiam into test
Fixed parameter setting in K3Supervisor
Fixed behaviour on simulation reset
Merge branch 'physics' of github.com:whittenjaw85/pysimiam
Merge branch 'supervisor-abstract-ui' of github.com:whittenjaw85/pysimiam

Conflicts:
	robots/khepera3.py
	scripts/robot.py
	scripts/simobject.py
	scripts/simulator.py
Merge branch 'test' of github.com:whittenjaw85/pysimiam

Conflicts:
	scripts/simulator.py