Merge branch 'hotfix/1.0.3' into develop
organized and update gemfile
Merge branch 'master' into develop
Merge branch 'develop' into feature/blog