Merge branch 'master' into english
-rw-r--r-- 999 .gitignore
drwxr-xr-x - AmuseWiki
-rw-r--r-- 4059 README.txt
drwxr-xr-x - Text-Muse-HTML-Importer
drwxr-xr-x - Text-Muse
drwxr-xr-x - doc
-rwxr-xr-x 70 dump-templates-here.sh
-rwxr-xr-x 1409 global-compiler.sh
-rwxr-xr-x 167 merge-master-in-branches.sh
-rwxr-xr-x 86 send-templates-there.sh
drwxr-xr-x - templates
drwxr-xr-x - utils