Merge branch 'dev-V1.5' of https://github.com/kpetouk/appsgate-client into dev-V1.5

Conflicts:
	app/templates/program/nodes/ifNode.html
	app/templates/program/nodes/stateNode.html
merging