merged master

diff --cc src/main.prj
index f2d50f9,db2b7d3..f0b6422
--- 1/src/main.prj
--- 2/src/main.prj
+++ b/src/main.prj
@@@ -420,9 -419,9 +420,37 @@@ OtherModule
                        ReadableABC:    False
                        ReuseUniqueNodes:       True
                        Fusion: False
++      Module
++              Name:   System.OS
++              Dir:    {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Linux-64
++              Compiler
++                      NeverMemoryProfile:     False
++                      NeverTimeProfile:       False
++                      StrictnessAnalysis:     True
++                      ListTypes:      StrictExportTypes
++                      ListAttributes: True
++                      Warnings:       True
++                      Verbose:        True
++                      ReadableABC:    False
++                      ReuseUniqueNodes:       True
++                      Fusion: False
++      Module
++              Name:   System.OS
++              Dir:    {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Linux-64
++              Compiler
++                      NeverMemoryProfile:     False
++                      NeverTimeProfile:       False
++                      StrictnessAnalysis:     True
++                      ListTypes:      StrictExportTypes
++                      ListAttributes: True
++                      Warnings:       True
++                      Verbose:        True
++                      ReadableABC:    False
++                      ReuseUniqueNodes:       True
++                      Fusion: False
        Module
                Name:   Control.Applicative
 -              Dir:    {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent
 +              Dir:    {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent
                Compiler
                        NeverMemoryProfile:     False
                        NeverTimeProfile:       False

diff --cc src/parse.icl
Simple merge