Layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/com/dlsu/savant/Create_Site$1.class
	bin/classes/com/dlsu/savant/Create_Site.class
	bin/classes/com/dlsu/savant/MainActivity.class
	bin/classes/com/dlsu/savant/R$dimen.class
	bin/classes/com/dlsu/savant/R$drawable.class
	bin/classes/com/dlsu/savant/R$id.class
	bin/classes/com/dlsu/savant/R$integer.class
	bin/classes/com/dlsu/savant/R$layout.class
	bin/classes/com/dlsu/savant/R$menu.class
	bin/classes/com/dlsu/savant/R$string.class
	bin/classes/com/dlsu/savant/R$style.class
	bin/classes/com/dlsu/savant/R$styleable.class
	bin/classes/com/dlsu/savant/Site.class
	bin/classes/com/dlsu/savant/SiteAdapter$SiteHolder.class
	bin/classes/com/dlsu/savant/SiteAdapter.class
	bin/classes/com/dlsu/savant/Splash.class
	bin/classes/com/dlsu/savant/Survey.class
	bin/classes/com/dlsu/savant/View_Site.class