add scrollview in search by character function
Merge branch 'master' of https://github.com/ironlulu/FloraSG

Conflicts:
	floraSG/bin/classes.dex
	floraSG/bin/classes/com/example/florasg/GUI/BrowseActivity.class
	floraSG/bin/classes/com/example/florasg/GUI/CameraActivity.class
	floraSG/bin/classes/com/example/florasg/GUI/NewsActivity.class
	floraSG/bin/classes/com/example/florasg/GUI/ProfileActivity.class
	floraSG/bin/classes/com/example/florasg/GUI/SearchActivity.class
	floraSG/bin/classes/com/example/florasg/GUI/TabMainActivity.class
	floraSG/bin/classes/com/example/florasg/MainActivity.class
	floraSG/bin/classes/com/example/florasg/R$layout.class
	floraSG/bin/classes/com/example/florasg/R$menu.class
	floraSG/bin/classes/com/example/florasg/R$string.class
	floraSG/bin/classes/com/example/florasg/R$style.class
	floraSG/bin/floraSG.apk
	floraSG/bin/resources.ap_
	floraSG/gen/com/example/florasg/R.java
	floraSG/res/layout/activity_search.xml
	floraSG/res/values/strings.xml
	floraSG/src/com/example/florasg/GUI/profileGUI/BookmarkActivity.java