Subject: test1.php modifiefd wit 2 and pushed from dev brnach
Subject: test1 modifed with 3 in dev
Merge branch 'master' into dev

Conflicts:
	test1.php