rr
Merge branch 'master' of https://github.com/Ehudp/BnotyaProject

Conflicts:
	BnotyaApp/bin/BnotyaApp.apk
	BnotyaApp/bin/classes.dex
	BnotyaApp/bin/jarlist.cache
	BnotyaApp/bin/resources.ap_
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar