UTF-8
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/laurinka/skga/server/scratch/SkgaHCPChecker.java
iml ignore