transaction test
update user and role
Merge branch 'master' of https://github.com/galahade/scommerce.git
update again