Added optional condition to AggregateColumn behavior
Improved sortable behavior - fixes some inconsistencies
Renamed old_scope attribute to oldScope
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
Merge remote-tracking branch 'upstream/master' into aggregate_condition
Merge remote-tracking branch 'upstream/master' into aggregate_condition
Improve code generation to follow PSR recommendations
Fix NULL => null
Fix doc blocks
More CS fixes
Fix tests
Avoid blank line in object stub class
fix for issue 425

GeneratorConfig should now correctly be applied to AppData in PropelQuickBuilder
fix for issue 425

- added test
- fixed config applied to wrong AppData
Update generator/build.properties-sample

fixed typo
Merge pull request #431 from c33s/patch-1

Update generator/build.properties-sample
Merge pull request #430 from Powerhamster/issue-425

Issue 425 fixed config applied to wrong AppData
Prepare 1.6.7 release
Fix PropelObjectCollection to use the right approach during search()/contains()

Currently; we try to determine if an object is part of a collection by using a
strict comparison, objects have to have the same reference to be considered
identical. It could make sense but in real life, you can get the same
reference for two objects. By using a hash code, we better handle this special
case, only for ActiveRecord objects.