dynamix category creation
Merge branch 'master' of https://github.com/Setebos/Gallery

Conflicts:
	app/modele/ImageManager.php
	index.php