mantkiew Merge remote-tracking branch 'refs/remotes/origin/master' into behavi…
a85ffa3 Jan 10, 2017
Merge remote-tracking branch 'refs/remotes/origin/master' into behavi…
…oral

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