[Module Tag script: framework 2.10.1.18]
fix reload issue
Merge branch 'release/2.10' into release/2.11

Conflicts:
	.gitattributes
	amp_conf/htdocs/admin/functions.inc.php
	amp_conf/htdocs/admin/libraries/view.functions.php
Merge branch 'release/2.11' into release/12.0