a
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/src/main/java/com/miniinf/OSPManager/web/controllers/OperationController.java
Testy + JavaDoc