Fixed bug in canny segmentation.
Mod subsegment in Canny segmentation.
Merge branch 'master' of https://github.com/dlwh/puck

Conflicts:
	src/main/scala/puck/parser/gen/JavaFriendlyGenRuleMultiply.scala