Bo
Merge remote-tracking branch 'origin/master'

Conflicts:
	HSA/src/com/hsa/fragment/SearchFragment.java