Update 11 Samsung

Conflicts:

	Makefile

Conflicts:

	Makefile