Merge
Merge branch 'master' of ssh://git@github.com/dmatej/cis-config.git

Conflicts:
	cis-config-ejb/src/main/java/cz/i/cis/config/ejb/dao/ConfigurationItemDao.java
	cis-config-ejb/src/main/java/cz/i/cis/config/ejb/dao/ConfigurationItemKeyDao.java