Merge remote-tracking branch 'upstream/master' into comsode-develop
Merge remote-tracking branch 'upstream/master' into comsode-develop
Removed TCP/IP communicatio between frontend and backend, replaced by Spring Remoting/RMI
Merge branch 'comsode-develop' of git://github.com/mkl-eea-sk/ODCS into feature/tcp-ip-communication-frontend-backend
Merge branch 'feature/tcp-ip-communication-frontend-backend' into develop