[ prototyping/mixfix ] Relaxed some constraints to compile with ghc-7.8.
[ prototyping/mixfix ] Print error when benchmarks is called wrongly.
[ Sharing ] disableDestructiveUpdate in interaction and tryConversion.
[ Parser ] Refactor: Removed two uses of 'flip'.
Merge branch 'maint-2.4.2'

Conflicts:
	src/prototyping/mixfix/benchmarks/Test.hs
	src/prototyping/mixfix/benchmarks/mixfix-benchmarks.cabal
[ interaction test ] Updated output after disableDestructiveUpdate.
[ issue 1293 ] Renamed qualified name
[ issue 1293 ] Using monadic pretty printer combinators
[ issue 1293 ] Cosmetic changes
[ issue 1293 ] Cosmetic changes
[ issue 1293 ] Renamed functions

showArg -> prettyArg
showPat -> prettyPat
[ issue 1293 ] Added Pretty instances
[ issue 1293 ] Replaced show function by pretty[TCM|Show]
Merge branch 'maint-2.4.2'

Conflicts:
	src/full/Agda/TypeChecking/Errors.hs
Merge remote-tracking branch 'upstream/master'