fixed bug with history refreshing too much. Closes #62.
Merge branch 'master' into dev

Conflicts:
	build/Paint.JAVA.jar