Combine article byline and meta information into one block
Merge branch 'master' of https://github.com/guardian/mobile-apps-article-templates into GIA-2604-bylinemetacombo

Conflicts:
	ArticleTemplates/css/style.css
Bug fixes and tweaks to feature template
Bug fixes for features templates (and h2 styling, inline figures in live blog blocks)
Merge branch 'master' of https://github.com/guardian/mobile-apps-article-templates into GIA-2604-bylinemetacombo

Conflicts:
	ArticleTemplates/css/scss/templates/_standard-article.scss
	ArticleTemplates/css/style.css
Fix byline author image bleeding outside circle on Android <4.3
Correctly position commentator cutouts on Android <4.3
Article header tweaks
Merge branch 'master' of github.com:guardian/mobile-apps-article-templates into GIA-2604-bylinemetacombo

Conflicts:
	ArticleTemplates/css/scss/templates/_standard-article--comment.scss
	ArticleTemplates/css/scss/templates/_standard-article--features.scss
	ArticleTemplates/css/style.css
Remove debug styles
Remove needless code from liveblog styles
Merge pull request #113 from guardian/GIA-2604-bylinemetacombo

Gia 2604 bylinemetacombo