Merge branch 'master' of https://github.com/Gigaspaces/gigaspaces-wiki-jekyll

Conflicts:
	tutorials/java-home.markdown