some back to basic

Conflicts:
	system.prop