s05-us63 - Search string included in SearchResultActivity title.
Merge remote-tracking branch 'origin/s05-us63' into dev

Conflicts:
	src/com/yinyang/so/controllers/SearchController.java
Merge branch 'dev' of https://github.com/danidanone17/YinYangApp into dev