Made a search activity
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers

Conflicts:
	Agora/AndroidManifest.xml
	Agora/gen/com/brogrammers/agora/R.java
	Agora/res/values/strings.xml