home page top menu #86
Merge branch 'master' of github.com:hmert/ojs
travis goodness
merge conflick