Test 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/test.xml