just synching
Merge branch 'master' of https://github.com/CorpusCallosum/LANscapes

Conflicts:
	LANscapes_OF83/bin/data/settings.xml