some changes
Merge remote-tracking branch 'origin/master'

Conflicts:

	stavebniStroje-service/src/main/java/cz/muni/fi/stavebniStroje/serviceImpl/MachineServiceImpl.java
merge and changes
Merge branch 'master' of https://github.com/valdy89/stavebniStroje