Merge branch 'scene_simple' into running

Conflicts:
	lib/read_table_A.pl
Merge branch 'pa' into running

Conflicts:
	lib/read_table_A.pl