unfix threading
Merge branch 'master' of https://github.com/sciencewiz1/maslab-staff-2013

Conflicts:
	VisionSystem.py
	actions.py
	ir_log.txt
	log.txt
	main.py
	wrapper.py

Merge