changed search layout
Merge branch 'master' of https://github.com/zwaldowski/ProjectTeamRocket

Conflicts:
	.gitignore
	FindMyThings/res/layout/activity_search_new.xml
	FindMyThings/src/edu/gatech/oad/rocket/findmythings/Helpers/TabHelp.java
	FindMyThings/src/edu/gatech/oad/rocket/findmythings/ItemListFragment.java
	FindMyThings/src/edu/gatech/oad/rocket/findmythings/MainActivity.java
	FindMyThings/src/edu/gatech/oad/rocket/findmythings/NonActivity/Controller.java