Replaced thd build.xml with the old manual version.Added javax.json to the
libs and replaced jdbc sqlite 3.7.2 with 3.8.5
Merge branch 'master' of github.com:cyclus/cyclist2
change Chart name to Plot
fix bug in Inventory where a series was added everytime the filtered_inventory changed even if the agent was disabled
Merge branch 'master' of github.com:SCI-Utah/cnome