Merge branch 'master' of /home/yohana/work/Repos/github/guy-mograbi-at-gigaspaces/ibm-biginsights-ui with conflicts.