JC: added style. More CN.
JC: removed gemfile.lock
Merge branch '3.2.12.01' of github.com:emclab/supplierx into 3.2.12.01