Merge branch 'master' of https://github.com/hskaw/WIFE

Conflicts:
	coffee-script/simplex.coffee
Merge again
Fixed cancel criteria search, fixed nedless loop in fraction string method when arg was undefined