Merge branch 'master' of https://github.com/kpetouk/appsgate-client

Conflicts:
	www/js/modules/program.js
	www/js/templates/program/editor/editor.html
Merge branch 'master' of https://github.com/kpetouk/appsgate-client

Conflicts:
	www/js/modules/program.js