Add teatro config
Merge pull request #1559 from davetoxa/master

Getting ready for Teatro
Merge branch 'master' into dev
Merge branch 'dev' into 0.8
#1546