Fixed Update File Asset Reln migration
Merge branch 'development' of https://github.com/portablemind/compass_agile_enterprise into development
Fixed sql ambiguous column error in ScopedBy extension.  Was erroring when joining file_assets tables
Merge remote-tracking branch 'origin/development' into asset_pipeline

Conflicts:
	erp_tech_svcs/lib/erp_tech_svcs/extensions/active_record/scoped_by.rb