merging changes in admin panel#21

rootSpook wants to merge 4 commits into

mainrootSpook/MG_NGO_Website:mainfrom

admin-panelrootSpook/MG_NGO_Website:admin-panelCopy head branch name to clipboard