Merge pull request #7 from jzvelc/master

Angular.js module fix
display for articles (/article/1), no style, split articles.json into separate files
Merge pull request #8 from jani-bevk/article

articles reviewed.
Updated service, controller, view and json files for journals
Fixed typo that caused error in journals/id
Resolved conflicts for merging master and journal branch
Merge pull request #9 from mancabizjak/master

Added journal functionality
implemented search, bootstrap
merged with upstream
reduced to single journal, article & section integration