Merge remote-tracking branch 'origin/master'

Conflicts:
	src/dagsverket/gui/mainWindow/ToolBar.java