Added changes for suckale wisski
Merge branch 'master' into suckale

Conflicts:
	wisski_pathbuilder.inc
	wisski_pathbuilder.module