Added optional condition to AggregateColumn behavior
Improved sortable behavior - fixes some inconsistencies
Renamed old_scope attribute to oldScope
Improved SQLParser to work with triggers in additional .sql files
Fixed possible bug
Merge remote-tracking branch 'upstream/master' into aggregate_condition

Conflicts:
	generator/lib/behavior/aggregate_column/AggregateColumnBehavior.php
	generator/lib/behavior/aggregate_column/AggregateColumnRelationBehavior.php
Merged with condition
Change ObjectBuilder to reload related objects when collection is partially loaded
Fix joining related object
Fixed Versionable Object Modifier not to reload object collection after populateFromVersion
Fix data loss where parent object won't save related objects when fetched with criteria
Fix collection cache overriding existing one when related object are fetched with criteria
add test to prove to much query on aggregate_column behavior
[aggregate_column behavior] computeCall call reduced from n+1 to 1 or 2 fix #403,
add computeCall on main object save()
add isAlreadyInSave(),
fix call on a non object ;)
Merge pull request #406 from jaugustin/fix-aggregate-column-call

Fix aggregate column n+1 call to computeCall 
Fix platform loading
add test to show the inheritance issue with php5.4
fixes translateFieldname and concrete inheritance

sometimes translation were lost due to concrete inheritance.
Merge pull request #408 from themouette/peer-inheritance

Peer inheritance