Merge origin/master into HEAD

Conflicts:
	src/gittest/pkg2/separate/maskiner/GitTest2SeparateMaskinerApp.java