Title: Jans F2 part 1
Title: Jans f2 part 2
Title: David f3 p1
Title: David f3 p2
Title: Hakans F1 part 1
Title: Hakans F1 Part 2
Title: Jans F2 part 1
Title: Jans f2 part 2
Title: Merging from towards-release-2 to jans-f-2 continues
Merge branch 'jans-f-2' into towards-release-02

Conflicts:
	a.txt
	b.txt
	c.txt