Initial commit for Touchwiz version

Conflicts:

	Makefile