Added basic SQL database with Campus info and search functionality to DrawerLayout
adding SQL
Merge branch 'master' of https://github.com/patrickg2014/Capstone

Conflicts:
	Capstone/bin/Capstone.apk
	Capstone/bin/R.txt
	Capstone/bin/classes.dex
	Capstone/bin/classes/com/cs440/capstone/AboutActivity.class
	Capstone/bin/classes/com/cs440/capstone/BuildingInfoActivity.class
	Capstone/bin/classes/com/cs440/capstone/CameraActivity.class
	Capstone/bin/classes/com/cs440/capstone/CustomDrawerAdapter.class
	Capstone/bin/classes/com/cs440/capstone/EventInfoActivity.class
	Capstone/bin/classes/com/cs440/capstone/HelpActivity.class
	Capstone/bin/classes/com/cs440/capstone/MainActivity.class
	Capstone/bin/classes/com/cs440/capstone/R$drawable.class
	Capstone/bin/classes/com/cs440/capstone/R$id.class
	Capstone/bin/classes/com/cs440/capstone/R$integer.class
	Capstone/bin/classes/com/cs440/capstone/R$layout.class
	Capstone/bin/classes/com/cs440/capstone/R$menu.class
	Capstone/bin/classes/com/cs440/capstone/R$string.class
	Capstone/bin/classes/com/cs440/capstone/R$style.class
	Capstone/bin/classes/com/cs440/capstone/R$styleable.class
	Capstone/bin/classes/com/cs440/capstone/R$xml.class
	Capstone/bin/classes/com/cs440/capstone/SettingsActivity.class
	Capstone/bin/classes/com/facebook/android/R$id.class
	Capstone/bin/jarlist.cache
	Capstone/bin/resources.ap_
	Capstone/gen/com/cs440/capstone/R.java
	Capstone/gen/com/facebook/android/R.java