'[c9] added missing package.json'
Merge pull request #1 from acmetech/master

Get version in sync with the engine
update gitignore
update versions. add groups
upgrade to rails 4
notes duplicating due to precompiled assets in the test app.
update gitignore
Rename EmbeddedObject to ActivityObject
remove the parent_id column and use target_it in its place
Merge pull request #2 from acmetech/master

socializer_test - Get things working on Rails 3.2.13
updated versions
sync with socializer after renaming the embeddable polymorphic relationship
change group privacy_level to an integer
Merge branch 'master' of github.com:dominicgoulet/socializer_test
Merge branch 'rails4' of https://github.com/acmetech/socializer_test into acmetech-rails4

Conflicts:
	.gitignore
	Gemfile.lock
	config/application.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/inflections.rb
	config/initializers/session_store.rb
	config/initializers/wrap_parameters.rb
	config/routes.rb
bring up to date and fix merge conflicts