Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge pull request #18 from Studentmediene/develop

Develop
added a couple themes from bootswatch.com
moved article stuff into it's own view
sort of works?
article nav by id
more duumy stuff
make the navbar work
MOM-13 started work on publications
article getter in controller
use the dev controller to create a dummy article, sucessfully GET that article in the webapp
works pretty well with test articles from dev controller
article GET (MOM-18) and PUT (MOM-17) works pretty well now. Reverted note stuff to use /api/note for now
article GET (MOM-18) and PUT (MOM-17) works pretty well now. Reverted note stuff to use /api/note for now
Merge remote-tracking branch 'origin/article-edit-view' into article-edit-view

Conflicts:
	src/main/java/no/dusken/momus/service/ArticleService.java
	src/main/webapp/app/js/controllers/article.js
MOM-19 added a modal for editing the metadata box, can now add journalists
MOM-19 adding functionality for photographers