Working on functional tests
Updated functional tests so that they all pass
Wrapping up function test config
Moved config
Fixed gitignore
Updated Version 3.3.008.011
Merge branch 'develop' into develop-4

Conflicts:
	version.txt