Add jadeconfig
Merge branch 'jade-config' into develop
Merge branch 'develop'