Merge branch 'release/1.4.0' into develop
Merge branch 'release/1.4.0' into develop
Initial try.
forgot files..
Merge commit '71bdf1d' into develop

Conflicts:
	build/LSML Setup.wxs
	src/lisong_mechlab/view/LSML.java
Adding unit tests for new classes.
Merge branch 'feature/issue225' into develop

* feature/issue225:
  Adding unit tests for new classes.
  forgot files..
  Initial try.
Changing critical hit victim multiplicity to not be %.
Merge commit '6f74111' into develop

* commit '6f74111':
  Fixing issue #249
Merge commit 'f956595' into develop
Merge branch 'release/1.4.0' into develop
Merge branch 'release/1.4.0' into develop

* release/1.4.0:
  Fixing issues #252 and #251.
Prototyping/Testing, import works on http.
HTTPS transfer works. Added option to remember API key.
Upload works now. Issue #185 is complete for now. Batch upload can be done later if there is need for it.
Adjusting menu names.
Merge branch 'feature/185_smurfy' into develop
Cleaning up huffman coder and adding error detection and a better estimate of buffer size required for encoding.
Revert "Cleaning up huffman coder and adding error detection and a better estimate of buffer size required for encoding."

This reverts commit 1509bad21831af876047851a7a810ec36472eb41.
Adding only the intended file...