Fixed 'add another organization'
Updated template scripts
Fixed novnc https problem
Merge pull request #281 from dswd/fix-organizations

Fix organizations
Merge pull request #282 from dswd/template-scripts

Updated template scripts
Merge pull request #283 from dswd/fix-novnc-https

Fixed novnc https problem
Merge pull request #284 from dswd/fix-template-change

Fixed template changes