Delete
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/SAVANT.apk
	bin/classes.dex
	bin/classes/com/dlsu/savant/Create_Site.class
	bin/classes/com/dlsu/savant/View_Site$1.class
	bin/classes/com/dlsu/savant/View_Site$2.class
	bin/classes/com/dlsu/savant/View_Site$3.class
	bin/classes/com/dlsu/savant/View_Site$4.class
	bin/classes/com/dlsu/savant/View_Site$5.class
	bin/classes/com/dlsu/savant/View_Site.class
	bin/classes/objects/SiteSuggestionAdapter.class

	bin/dexedLibs/android-support-v7-appcompat-0253a3cb2e3384907b4564cddb8e01a9.jar
	bin/resources.ap_