update fct_testing for more automation
Merge branch 'master' of http://github.com/paulinev/fct

Conflicts:
	fct_testing.py
fixing fct_testing