merge master
merge master and modified init-jdee