sync

synt
Merge branch 'master' of https://github.com/Jtester2013/Jtester

Conflicts:
	src/core/common/svd/path/PathGenerator.java
resolve conflict
fix conflict
Exausted

Sigh