commit
friends list end
Merge branch 'Gants2'

Conflicts:
	TizenProject/.settings/org.eclipse.core.resources.prefs