Merge branch 'master' into develop
Merge branch 'feature/sass' of github.com:diowa/twbs_sass_rails into feature/sass
Added a file for variables customization