testing merging in admin area
hotfix
Merge branch 'hotfix' into develop

* hotfix:
  hotfix

Conflicts:
	index.php