improve Toulbar2 parsing
Merge origin/fzn
Merge origin/fzn
Merge branch 'fzn' of github.com:degivry/Numberjack into fzn

Conflicts:
	fzn/fzn2py.awk