shop setup working
deleted ci_login
deleted ci_login
Merge branch 'user'
shop settings add/edit
deleted some logo
Merge branch 'user'