superbranch
Merge remote-tracking branch 'origin/master' into Newsuperbranch

Conflicts:
	test.txt
superbranch
Merge pull request #7 from NeoTech/Newsuperbranch

Newsuperbranch
Merge remote-tracking branch 'origin/master' into AP1

Conflicts:
	test.txt
12