Rails 3.2
fixes for rails 3.2
Merge branch 'master' into rails32
fixing deprecation warning in sunspot
changing set_table_name to self.table_name to fix deprecation warning
upgrading awesome_nested_set to fix deprecation warnings
fixing rails 3.2 deprecation warning:
WARNING: The InstanceMethods module inside ActiveSupport::Concern will be no longer included automatically
Merge branch 'master' into rails32
updated versions of our gem dependencies and removed unused erp_tech_svcs files
bug fixes for erp_agreements specs, removed un needed erp_tech_svcs initializer
compass_ae_console and erp_agreements pass tests
erp_base_svcs specs pass
fixed bug in migrations
Merge branch 'rails32' of github.com:portablemind/compass_agile_enterprise into rails32
erp_app specs passing
erp_commerce specs pass
Merge branch 'master' into rails32

Conflicts:
	erp_invoicing/lib/erp_invoicing/version.rb
erp_communication_events specs PASS
removed spec for model that no longer exists
Merge branch 'master' into rails32
adding prismpay dependency back in