fixed the bug that the template label in element config window was not updated after changing it
removed an unused line
Merge pull request #677 from t-gerhard/update_template_name

fixed the bug that the template label in element config window was not u...
Fixed vncterm so that it restarts after 30 minutes instead of shutting down
Merge pull request #680 from dswd/fix-vncterm

Fixed vncterm so that it restarts after 30 minutes instead of shutting down
Created OpenFlow tutorial
Merge pull request #682 from dswd/openflowtut

Created OpenFlow tutorial
Allowing custom icons for templates
Enhancements
Fixed nlxtp guest module package
Merge pull request #685 from dswd/fix-nlxtp-deb

Fixed nlxtp guest module package
Fixed template help url
Packaged websockify 0.6.0
Merge pull request #683 from dswd/template-icons

Allowing custom icons for templates
Merge pull request #686 from dswd/fix-template-url

Fixed template help url
Running websockify with SSL support
Trying SSL connection in NoVNC with fallback to unencrypted
Merge pull request #687 from dswd/vnc_security

Vnc security
Added usage statistics for users, organizations and hosts
Made the statistics gathering more flexible