Merge origin/master
work towards labels, references and text
small fixes and adjustments
work towards references and text part 2
work towards references and text part 2.5
work towards references and text part 2.6