us56
Merge remote-tracking branch 'origin/s04-us56-local' into dev

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/yinyang/so/activities/SearchResultActivity.java
	src/com/yinyang/so/database/DatabaseAdapter.java