Fixes issue #77: Bug in the layout mechanism
Fixes fix for issue #77
Merge branch 'master' of https://github.com/simhu/bnfc into simhu-master

Conflicts:
	source/src/BNFC/Backend/Haskell/CFtoLayout.hs
Merge branch 'simhu-master'
Merge branch 'master' of github.com:BNFC/bnfc