Revert "fixed some unit tests"

This reverts commit 120518d80336efdb1641f9e61f5c2b46d13988de.
Revert "renamed an internal variable"

This reverts commit a176fadc042bbfa09b0f304bef9ec89850f6e06f.
Revert "added an exception when a macro re-uses the same argument name twice"

This reverts commit b7a54b01017becf7f3b90beadc71536b58e2299a.
Revert "updated CHANGELOG"

This reverts commit 7ffca6c735bec4d37186ed10162134c978160f17.

Conflicts:
	CHANGELOG
Revert "merged branch hason/macros (PR #1139)"

This reverts commit 03926034c452bbf7f3bcc14dd167acf39bb33818, reversing
changes made to 730aa25bedeee922c361640f6e4c01e4e6bac998.

Conflicts:
	CHANGELOG
	doc/tags/macro.rst
	doc/templates.rst
	lib/Twig/ExpressionParser.php
feature #1215 Macros changes removal (fabpot)

This PR was merged into the master branch.

Discussion
----------

Macros changes removal

This PR reverts the changes made to macros in 1.14.

The initial PR looked massive and I was not comfortable with the changes, but I merged it anyways. But the latest PR about fixes some bugs in the implementation -- and adding some more changes (#1213) really scares me.

So, instead of continuing doing big changes, I prefer to revert everything for now, release 1.14 and give more time for these changes to mature and eventually be merged again.

Commits
-------

74586e9 Revert "merged branch hason/macros (PR #1139)"
bf40fa3 Revert "updated CHANGELOG"
c3e05f3 Revert "added an exception when a macro re-uses the same argument name twice"
524e406 Revert "renamed an internal variable"
60b575f Revert "fixed some unit tests"