Hibernate4 + SSH access
Merge remote-tracking branch 'origin/master'

Conflicts:
	kraud-desktop/kraud-desktop.iml