database
Merge remote-tracking branch 'origini/master'

Conflicts:
	app/src/main/java/com/example/lovasistvn/tmap/MapPoint.java