merge commit
Merge branch 'master' of https://github.com/dmerckx/cpl.git

Conflicts:
	src/handling/Handler.scala
	src/handling/exceptions/Exceptions.scala
Merge branch 'master' of https://github.com/dmerckx/cpl.git

Conflicts:
	src/parser/Parser.scala