added neighbour gushim logic
merged changes from master
fix clear highligh problems
fix tests and hash bug from merge
Merge branch 'master' into server_issue_61