added friendship model and register_friendship
fix merge errors
basic views