added search icon
changed the theme to Holo.Light
changed theme to Holo.Light
added more strings
Merge branch 'master' of github.com:CMPUT301F13T06/ClassProject

Conflicts:
	bin/AndroidManifest.xml
	res/values/strings.xml