Notification létrehozásának véglegesítése

Még a törlés hiányzik
Merge remote-tracking branch 'origin/master'

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

	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.class

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

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