"this is my branch"
jangyoungjin
Merge branch 'young'

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	src/com/tleaf/lifelog/activity/BookmarkShareActivity.java
	src/com/tleaf/lifelog/fragment/BookMarkFragment.java
	src/com/tleaf/lifelog/model/Lifelog.java
	src/com/tleaf/lifelog/model/Location.java
	src/com/tleaf/lifelog/model/UserInfor.java
	src/com/tleaf/lifelog/network/CouchDBLiteTask.java
	src/com/tleaf/lifelog/network/CouchDBTask.java
	src/com/tleaf/lifelog/network/DatabaseConnector.java
merge finished
last merged
young2 commit