proc+Gemfile+config
proc+Gemfile+config
gemlock app
Merge branch 'feature/peggy' into develop

merge by git flow
the final version of webservice
Merge branch 'feature/Anita' into release/0.0.4
Merge branch 'release/0.0.4'