trace man update temp
plus While Node
merging
fixing bug of no grammar...
Merge branch 'master' of https://github.com/appsgate2015/appsgate into test