changed layout overlap names
Merge branch 'master' of https://github.com/Monica-Farkash-2013/mp2.git

Conflicts:
	res/layout/connexus_view.xml
	res/layout/search_image_grid_fragment.xml
	src/com/example/android/bitmapfun/ui/SearchStreamGridFragment.java