Merge branch 'master' of /home/sirus/code/intellij/Wilsim with conflicts.
began changes for erosion function to proportional mode. non functional build do not sync for production. just switching computers