1507
1507
Merge branch 'master' of https://github.com/yamin-elmakis/yamin-vova

Conflicts:
	Doging/src/com/VY/doging/Map/GetTripPoints.java
	Doging/src/com/VY/doging/NoticeByFixTime.java