Merge pull request #170 from VirtualFlyBrain/master

Bringing up to date
Merge branch 'master' into Sandbox-Server
Merge branch 'master' into Sandbox-Server

Conflicts:
	resolved by @Robbie1977
Merge pull request #200 from VirtualFlyBrain/master

Bringing up to date
Merge pull request #204 from VirtualFlyBrain/master

Bringing up to date
Merge pull request #209 from VirtualFlyBrain/master

Bringing up to date
Merge pull request #214 from VirtualFlyBrain/master

Bringing up to date
Merge pull request #220 from VirtualFlyBrain/master

Bringing up to date
Merge pull request #230 from VirtualFlyBrain/master

Bringing up to date
Merge pull request #233 from VirtualFlyBrain/Dev-Server

Several layout tweaks to cope with very tight screen width.
Merge pull request #236 from VirtualFlyBrain/master

Bring dev up to date
Merge pull request #238 from VirtualFlyBrain/Dev-Server

Adding editing guide and framework for template download page
Merge pull request #239 from VirtualFlyBrain/Dev-Server

clearing up licensing contradiction
Update treeContent.jso
reserialised
Updated to use new domain IDs.  Single colour chosen for all new domains.  New colours still need to be chosen.
updated to use right side domain indexes only
updated brain to JFRC mask130819
reserialised
updated treeStructure