FAQ in admin panel
FAQ admin panel , resolved conflicts with merge
fixed conflicts added FAQ in admin page