Update master with latest from develop before deploying to QA
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of github.com:meedan/meedan-checkdesk
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Update master with latest from develop before deploying to QA
Merge branch 'master' of github.com:meedan/meedan-checkdesk
redo node tabs, mv shared.scss => mixins.scss
minor comments re Twitter Bootstrap
Merge branch 'develop' of github.com:meedan/meedan-checkdesk into feature/tab-colors
Merge branch 'develop' of github.com:meedan/meedan-checkdesk into feature/tab-colors

Conflicts:
	drupal/sites/all/themes/checkdesk/assets/css/style-rtl.css
	drupal/sites/all/themes/checkdesk/assets/css/style.css
Merge branch 'master' of github.com:meedan/meedan-checkdesk into feature/tab-colors
Merge branch 'feature/tab-colors' into develop