Merge branch 'dev' into mobile

Conflicts:
	src/main/java/org/traccar/web/shared/model/ApplicationSettings.java
	src/main/java/org/traccar/web/shared/model/Device.java