Revert "revert last pull requrest"

This reverts commit 42bc4f8dc41d49470854c6235955b256e0b307f8.

Conflicts:
	core_2.14/controllers/admin.php
fix admin.php
Merge branch 'dev'