more changes on the intra/inter functions
Using new IntraSw neighborhood generator.
Merge branch 'vdev' into develop
Merge branch 'sdev' into develop