Use a better way to include Jelly files from other classes
Merge branch 'ami-builder'