version bump
version bump
Fixing issues #248 and #247.
Merge commit '71bdf1d' into develop

Conflicts:
	build/LSML Setup.wxs
	src/lisong_mechlab/view/LSML.java