update gem models and config files
resolve merge conflicts
upload gem changes
remove bin files
Merge branch 'fix'