Merge branch 'andamio2-jquery-aliases' into andamio2-jaws
Merge branch 'andamio2-notransitions' into andamio2-jaws