sdev neighbors & tabu code is compiling
Merge branch 'sdev' into develop