Merge branch 'master' of https://github.com/guy-mograbi-at-gigaspaces/gs-webui-test-beans
Merge branch 'master' of https://github.com/guy-mograbi-at-gigaspaces/gs-webui-test-beans
merging upstream to push changes