ADMIN TEMPLATE added
Merge origin/master
ADMIN TEMPLATE added