added label
added righ label
added merge righ only to admin
merge button shows only to admin
added admin tests
repair admin tests
repair admin tests
repair admin tests
repair admin tests
repair admin tests
repair admin tests