Added changes from suckale wisski
Merge branch 'suckale'

Conflicts:
	wisski_find.module