Merge commit '2b2a98c0a4bd3e0ac40aff5a212a7446d9a8c976'

Conflicts:
	TutorFind/bin/classes/com/team7/tutorfind/DatabaseRequest.class
	TutorFind/bin/classes/com/team7/tutorfind/FavoritesFragment.class
	TutorFind/bin/classes/com/team7/tutorfind/MainActivity.class
	TutorFind/bin/classes/com/team7/tutorfind/ProfileEditFragment.class
	TutorFind/bin/classes/com/team7/tutorfind/R$id.class
	TutorFind/bin/classes/com/team7/tutorfind/R$layout.class
	TutorFind/bin/classes/com/team7/tutorfind/R$menu.class
	TutorFind/bin/classes/com/team7/tutorfind/R$string.class
	TutorFind/bin/classes/com/team7/tutorfind/R$style.class
	TutorFind/bin/classes/com/team7/tutorfind/R$xml.class
	TutorFind/bin/classes/com/team7/tutorfind/SearchResultsFragment$UserSummaryArrayAdapter.class
	TutorFind/bin/classes/com/team7/tutorfind/SearchResultsFragment.class
	TutorFind/gen/com/team7/tutorfind/R.java
	TutorFind/res/values/strings.xml
	TutorFind/src/com/team7/tutorfind/DatabaseRequest.java
	TutorFind/src/com/team7/tutorfind/FavoritesFragment.java
Add TAG to favorites fragment