syntax change for php 5.4 support
upgrade gems, specify ruby version
Update Sass readme
refactor and remove problematic gem
Switch to single breakpoint
Merge branch 'develop' of github.com:meedan/meedan-checkdesk into develop
update gems
refactoring widgets layout
add sass docs
node, story, evil hacks sass
refactor sass
rerender docs, clean out grunt styledocco
Merge branch 'refactor-bowerbird' into merge-refactor

Conflicts:
	drupal/sites/all/themes/checkdesk/assets/css/style-rtl.css
	drupal/sites/all/themes/checkdesk/assets/css/style.css
	drupal/sites/all/themes/checkdesk/assets/scss/_facebook_comments.scss
remove ie8 support, standardize component names
add typeplate as bower component
upgrading susy
Basic H&FJ typography setup. #1965
Merge branch 'merge-refactor' into develop

Conflicts:
	drupal/sites/all/themes/checkdesk/assets/css/style-rtl.css
	drupal/sites/all/themes/checkdesk/assets/css/style.css
	drupal/sites/all/themes/checkdesk/assets/extensions/bowerbird/stylesheets/bowerbird/_debug.scss
	drupal/sites/all/themes/checkdesk/assets/scss/_base.scss
	drupal/sites/all/themes/checkdesk/assets/scss/_layout_2col.scss
	drupal/sites/all/themes/checkdesk/assets/scss/_reports_page.scss
	drupal/sites/all/themes/checkdesk/assets/scss/_widgets.scss
	drupal/sites/all/themes/checkdesk/assets/scss/style-rtl.scss
	drupal/sites/all/themes/checkdesk/assets/scss/style.scss
Merge branch 'feature/susy2' into develop

Conflicts:
	drupal/sites/all/themes/checkdesk/assets/scss/_liveblog.scss
Merge branch 'develop' of github.com:meedan/meedan-checkdesk into develop