Merge remote-tracking branch 'origin/master'

Conflicts:

	PlayBoiler/bin/classes/cs307/team7/playboiler/CreateEventFragment$1$1.class

	PlayBoiler/bin/classes/cs307/team7/playboiler/CreateEventFragment$1.class
	PlayBoiler/bin/classes/cs307/team7/playboiler/CreateEventFragment.class
	PlayBoiler/bin/classes/cs307/team7/playboiler/Event.class
	PlayBoiler/bin/classes/cs307/team7/playboiler/FrontPageFragment.class
	PlayBoiler/bin/classes/cs307/team7/playboiler/Global.class
	PlayBoiler/bin/classes/cs307/team7/playboiler/MainActivity.class
	PlayBoiler/bin/classes/cs307/team7/playboiler/MySqlLiteHelper.class

	PlayBoiler/bin/classes/cs307/team7/playboiler/NavigationDrawerFragment$2.class

	PlayBoiler/bin/classes/cs307/team7/playboiler/NavigationDrawerFragment$3.class

	PlayBoiler/bin/classes/cs307/team7/playboiler/NavigationDrawerFragment.class
	PlayBoiler/bin/classes/cs307/team7/playboiler/ProfileFragment$1.class
	PlayBoiler/bin/classes/cs307/team7/playboiler/ProfileFragment$2$1.class
	PlayBoiler/bin/classes/cs307/team7/playboiler/ProfileFragment.class
	PlayBoiler/bin/classes/cs307/team7/playboiler/R$drawable.class
	PlayBoiler/bin/classes/cs307/team7/playboiler/R$id.class
	PlayBoiler/bin/classes/cs307/team7/playboiler/R$layout.class
	PlayBoiler/bin/classes/cs307/team7/playboiler/R$menu.class
	PlayBoiler/bin/classes/cs307/team7/playboiler/R$string.class
	PlayBoiler/bin/classes/cs307/team7/playboiler/R$style.class
	PlayBoiler/bin/classes/cs307/team7/playboiler/SearchFragment.class