adds option to add action tokens to url
Merge branch 'action-tokens' into au_fork

Conflicts:
	languages/en.php
Merge branch 'au_fork' of https://github.com/beck24/menu_builder into au_fork