Added type of user button
Fixed adding type of user to database
resolved conflicts