Merge branch 'master' of https://github.com/KgKostix/Organaizer.git

Conflicts:
	hibernate.cfg.xml
clean