.
Merge branch 'master' of https://github.com/acidclick/AcidORM

Conflicts:
	Generators/DB/Postgre.php