Merge branch 'func-typeable'

Conflicts:
	.gitignore
	src/Interpreter/Golog.hs
	src/Interpreter/Tree.hs
	src/Interpreter/TreeUtil.hs
	src/RSTC/BAT.hs