uprava
Merge branch 'master' of https://github.com/bouskfil/SIP

Conflicts:
Implementace/SIP/app/controllers/OtherController.java
Implementace/SIP/conf/routes
Merge branch 'master' of https://github.com/bouskfil/SIP

Conflicts:
	Implementace/SIP/app/controllers/OtherController.java
	Implementace/SIP/conf/routes
jkj