Merge branch 'gh-page' into master
merged gh-page into master
Merge branch 'gh-page'
Merge branch 'gh-page' into master
merged gh-page Ingo master
added article controller for main stories
merged master into gh-page