Final state for winter term 2016/17 Moved this tag here from cae3d15 as there were still changes afterwards.
