user panel simle login view added
user activation according to user type
conflic resolved