Modificato tutto ORM
ORM completo
prova1
Merge branch 'master' of https://github.com/blacking/Gallery

Conflicts:
	LICENSE