journalId & conferenceId managed
journalId & conferenceId managed
Merge branch 'req-PUB1' of github.com:WiseLib/Server into req-PUB1
Merge branch 'master' into req-PUB1

Conflicts:
	lib/publication.js
Fixed gulpfile to start server & syntax errors in routes.js