Merged branch develop into develop

.gitignore

@@ -29,6 +29,7 @@ __MANPAGES__/
 /modules/module-manager/downloads/*.zip
 
 /src/Ted2GO
+
 /modules/cmark
 /modules/lua
 /modules/wdw-game2d
@@ -41,6 +42,7 @@ __MANPAGES__/
 /modules/pyro-scenegraph
 /modules/bullet
 /modules/gles30
+/modules/timelinefx
 
 /modules/module-manager/backups