updated file headers
Merge remote-tracking branch 'MartinHaimberger/Devel'
removed switchsession hack