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

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

Updated template scripts
Removed useless line 161
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
Changed default elements
Added some safty checks for entity deletion
Merge pull request #286 from dswd/default-elements

Changed default elements
Merge pull request #287 from dswd/fix-on-delete

Added some safty checks for entity deletion