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

Conflicts:
	cis-config-war/src/main/java/cz/i/cis/config/web/backing/profile/ProfileEditBean.java
Merge branch 'master' of git@github.com:dmatej/cis-config.git
Merge branch 'master' of git@github.com:dmatej/cis-config.git
Merge branch 'master' of git@github.com:dmatej/cis-config.git
Merge branch 'master' of git@github.com:dmatej/cis-config.git
Merge branch 'master' of git@github.com:dmatej/cis-config.git
Merge branch 'master' of git@github.com:dmatej/cis-config.git
Merge branch 'master' of git@github.com:dmatej/cis-config.git
#57 added own class of exception for CisUserDao, update UserDaoTest and
CisUserDao
#57 commit & pull for NonExistentCategoryException(only for correct
error during push)
#57 refresh persistent.xml
#57 update other dao tests: they need to throw CisUserDaoException
Merge branch 'master' of git@github.com:dmatej/cis-config.git