1
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/insert.sql
	src/main/java/com/sun/manager/forms/admin/AbonementRequestController.java
	src/main/resources/db_config.properties