GS-11422
layouter configuration updated to use the x-axis flow parameter
Merge branch 'master' of https://github.com/guy-mograbi-at-gigaspaces/gs-ui-ks

Conflicts:
	app/scripts/controllers/topology.js
	app/views/main.html
ignoring .log and .iml files
fixing rainbow syntax highlighter conflict with twitter-bootstrap
setting convention for i18n files, adding locale files.
fixing codeblock directive and language variable delegation.
adding i18n directive and controller.
adding i18next as bower component.
fixing rainbow syntax highlighter conflict with twitter-bootstrap
Merge branch 'master' of https://github.com/guy-mograbi-at-gigaspaces/gs-ui-ks

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/guy-mograbi-at-gigaspaces/gs-ui-ks

Conflicts:
	.gitignore