Fixed merge
Merge branch 'master' of https://github.com/WiseLib/WiseLib
Removal of Angular '#' in urls and removed standard '.json' suffix
prepare for changes in DBManager and JSONManager
Merge branch 'req-PUB1' of https://github.com/WiseLib/WiseLib into req-PUB1
Parsers removed
added executeMultipleQueries
Modified postDiscipline and getDiscipline
updated postPublication
fixed syntax errors
postProceeding updated
postJournal updated again
updated postProceedingPublication, postJournalPublication
Merge branch 'req-PUB1' of github.com:WiseLib/Server into req-PUB1

Conflicts:
	lib/dbmanager.js
Fixed code according to conventions and added 'use strict' statement.
updated postPublication, postJournalPublication, postProceedingPublication
Fixed '/upload' route
Added upload link to menu and applied bootstrap theme to upload form.
Added upload link to menu and applied bootstrap theme to upload form.
removed unnecesseray executeMultipleQueries