Merge pull request #17 from pmar/unstable

jLinda tracked as submodule
missing modified files for 5.0.12
Recommiting jLinda as submodule

Simplest way to resolve conflicts between different versions of git
Merge pull request #18 from pmar/submodule_update

Recommiting jLinda as submodule