need to sync this branch with its origin before making the pull request (merge / pull request to merge develop into develop-issue_24). Hopefully that will resolve the conflicts.
Please do that and make this pull request again.
Also, FYI - I made another commit after reviewing the code; something I missed earlier in that a couple of the function names were misleading. see commit #10a5ae9
need to sync this branch with its origin before making the pull request (merge / pull request to merge develop into develop-issue_24). Hopefully that will resolve the conflicts.
Please do that and make this pull request again.
Also, FYI - I made another commit after reviewing the code; something I missed earlier in that a couple of the function names were misleading. see commit #10a5ae9