push Hassan's final changes
final hassan merge - push limited friend array and add new users