dd
Merge branch 'master' of git@github.com:ppech/EFC.git

Conflicts:
	EFC/src/main/java/cz/uhk/efc/factory/ProjectGrid.java
	EFC/src/main/java/cz/uhk/efc/services/impl/DriversServiceImpl.java
fix service
Merge branch 'master' of git@github.com:ppech/EFC.git

Conflicts:
	EFC/src/main/java/cz/uhk/efc/factory/ProjectGrid.java