fixing compilation and style
Merge branch 'latest' of https://github.com/guy-mograbi-at-gigaspaces/cloudify-widget-hp-client