Remove double main-content
Move nightingale aside to its place
Merge remote-tracking branch 'origin/master' into hospimed