new final configuration
Merge branch 'master' of https://github.com/gothma/deep-perception

Conflicts:
	6_perform_test.lua