ctyle includes rearanged
Merge branch 'master' of https://github.com/tech-team/tech_wallet