Merge admins
Fix bug tag
Merge Thanhpq
29/03/2014