merge
Merge branch 'master' of https://github.com/InFlame/DB3.git

Conflicts:
	src/media/definitions/Category.hbm.xml