Functor functionality started
Merge remote-tracking branch 'origin/master'

Conflicts:
	base/functors/functor_manager.py
	functor_testing.py