Added findOrBuild or findOrCreate
this won't cause any conflict
Merge branch 'master' of github.com:toktoktok/flourish-classes

Conflicts:
	fActiveRecord.php