Added article view
Merge branch 'sjark-master'