updated file_assets to support a many to many relationship
added comment to method
Merge remote-tracking branch 'origin/bootstrap' into product_catalog
Added category representations, category helpers to ProductType, acts_as_taggable & is_json :custom_fields to FileAsset
added migration to convert file_asset to file_asset_holder
fixed ProductType category bug
Merge branch 'product_catalog' of https://github.com/portablemind/compass_agile_enterprise into product_catalog
Merge remote-tracking branch 'origin/bootstrap' into product_catalog
fixed bug in migration and added attr_protected to file_asset_holder
category helpers now take a root category arg
Merge branch 'product_catalog' of https://github.com/portablemind/compass_agile_enterprise into product_catalog
added default args
bug fixes
comment out producttype category helpers
updated pricing plans to show plans that do not have a end date
moved Online Documents into an iframe
added migrations to remove unused applications
Merge remote-tracking branch 'origin/bootstrap' into product_catalog
removed data migration to create tasks application
Fixed incorrect Ext call, used jQuery equivalent