…oral

# Resolved Conflicts:
#	src/Language/Clafer/Generator/Choco.hs
#	src/Language/Clafer/Intermediate/ResolverName.hs
#	src/Language/Clafer/Intermediate/StringAnalyzer.hs
#	stack.yaml