Completed: Edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	SparkMoWare/gui/TablerLoader.java
	bin/gui/TablerLoader.class