Merge pull request #7 from okulbilisim/master

merge of merge
Article page WIP #163
Merge branch 'master' of https://github.com/hmert/ojs
Merge pull request #192 from hmert/master

Article Page