update indemma for better association assignment
Merge branch 'develop' into 0.5-stable