#42 was added or changed some exception classes
#43 update ProfileEditBean
Merge branch 'master' of git@github.com:dmatej/cis-config.git
#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