Merge branch 'master' into Main-Server
initialising dev server
initialising dev server
Merge branch 'master' into Dev-Server

Conflicts:
	data/flybrain/main/tiledImageModelData.jso
	src/resources.properties
Manual mods to bring inline with master
Merge branch 'master' into Dev-Server
adding symbolic link dir
Merge branch 'Dev-Server' of github.com:VirtualFlyBrain/VFB into Dev-Server
Merge branch 'master' into Dev-Server
ignoring backups
Merge branch 'Dev-Server' of github.com:VirtualFlyBrain/VFB into Dev-Server
Merge branch 'master' into Dev-Server
Merge branch 'master' into Dev-Server

Conflicts:
	.gitignore
added filters
added filters
filters added
mod
filters
fixed filter
file restored