Merge origin/master

Conflicts:
	src/db/entity/RouteTown.java
Merge origin/master