Merge branch 'master' of github.com:P54l0m5h1k/TechSupportExample

Conflicts:
	frontend/www/source/utils/jsondsl.js
Merge branch 'master' of github.com:P54l0m5h1k/TechSupportExample