adding
Merge branch 'master' into b_dev_addNewJEC
adding new JEC files
updating version
fixing bugs
version