CON-1790 add edit icon
CON-1790 CR fixes
CON-1790 CR second round
CON-1790 move ad next to hero image
Merge pull request #4946 from Wikia/CON-1790

CON-1790 Initial article layout styling
Merge branch 'CON-NewArticle' into CON-1788

Conflicts:
	extensions/wikia/Venus/styles/article/article.scss