Merge branch 'master' of github.com:yarden-livnat/cnome
Merge branch 'master' of github.com:cyclus/cyclist2
Merge branch 'master' of github.com:yarden-livnat/cnome
fix nuclide filter
fix issues when changing the type of the data (Net vs. Inventory)
adopt the Java 8 latest api