Csak a sync miatt
Merge remote-tracking branch 'origin/master'

Conflicts:
	FitnessApp/bin/FitnessApp.apk
	FitnessApp/bin/classes.dex

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/ChangePasswordActivity$2.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/ForgotPasswordActivity$2.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/LocationsActivity$7.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/LocationsActivity$MyInfoWindowAdapter.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/LocationsActivity.class
	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/R$string.class
	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/R$style.class
	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/R$styleable.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/ReservationActivity$1.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/ReservationActivity$3$1$1.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/ReservationActivity$3$1$2.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/ReservationActivity$3$1.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/ReservationActivity$3$2$1$1.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/ReservationActivity$3$2$1$2.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/ReservationActivity$3$2$1.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/ReservationActivity$3$2$2.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/ReservationActivity$3$2.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/ReservationActivity$3.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/ReservationActivity$4.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/ReservationActivity$5.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/ReservationActivity$6.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/ReservationActivity$7.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/ReservationActivity.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/volley/AlarmNotificationReceiver.class

	FitnessApp/bin/classes/hu/atyin/android/fitnessapp/volley/UrlCollection.class
	FitnessApp/bin/resources.ap_
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar
	google-play-services_lib/bin/google-play-services_lib.jar