comasdas
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ge/edu/sangu/unisys/db/DataBaseManager.java
	src/main/java/ge/edu/sangu/unisys/db/SqlManager.java
	src/main/java/ge/edu/sangu/unisys/ws/UniSys.java
	src/main/java/ge/edu/sangu/unisys/ws/UniSysService.java