several enhancements and updated js.jar to pull from github head
Merge branch 'airlift_2.0_development' of https://github.com/LucidTechnics/Airlift into airlift_2.0_development