Merge branch 'release/6' into develop
Update code styles based on middleman-styleguide framework