cleaning shop, push test
toying with neighborhood values
merge
fixed HEAD
Merge branch 'master' into development
Old master is obsolete.
temporary backup