Initial changes on reducing differences between fanhattan MM and the current standard version of MM.
SERV-719. Updated mongomapper according to the latest changes in the standard version and made the \"_type\" field configurable.
Merge branch 'standard' into SoftVision/SERV-719-use-standard-mongo-mapper

Conflicts:
	.bundle/config
	Gemfile
	Gemfile.lock
	lib/mongo_mapper/connection.rb
	lib/mongo_mapper/document.rb
	lib/mongo_mapper/plugins/accessible.rb
	lib/mongo_mapper/plugins/associations/base.rb
	lib/mongo_mapper/plugins/associations/belongs_to_association.rb
	lib/mongo_mapper/plugins/associations/many_association.rb
	lib/mongo_mapper/plugins/associations/single_association.rb
	lib/mongo_mapper/plugins/callbacks.rb
	lib/mongo_mapper/plugins/clone.rb
	lib/mongo_mapper/plugins/dirty.rb
	lib/mongo_mapper/plugins/document.rb
	lib/mongo_mapper/plugins/embedded_callbacks.rb
	lib/mongo_mapper/plugins/equality.rb
	lib/mongo_mapper/plugins/inspect.rb
	lib/mongo_mapper/plugins/keys.rb
	lib/mongo_mapper/plugins/protected.rb
	lib/mongo_mapper/plugins/querying.rb
	lib/mongo_mapper/plugins/sci.rb
	lib/mongo_mapper/plugins/validations.rb
	lib/mongo_mapper/version.rb
	mongo_mapper.gemspec
	test/functional/test_validations.rb
type key difference
type key difference
Merge branch 'SoftVision/SERV-719-use-standard-mongo-mapper' into fh-0.12.0

Conflicts:
	Gemfile
	lib/mongo_mapper/version.rb
	mongo_mapper.gemspec

	new file:   .bundle/config
	modified:   Gemfile
	new file:   Gemfile.lock
	modified:   lib/mongo_mapper.rb
	new file:   lib/mongo_mapper/config.rb
	modified:   lib/mongo_mapper/plugins/associations/base.rb
	modified:   lib/mongo_mapper/plugins/associations/belongs_to_association.rb
	modified:   lib/mongo_mapper/plugins/embedded_callbacks.rb
	modified:   lib/mongo_mapper/plugins/keys.rb
	modified:   lib/mongo_mapper/plugins/sci.rb
	modified:   lib/mongo_mapper/version.rb
	modified:   mongo_mapper.gemspec
	modified:   test/functional/associations/test_many_embedded_polymorphic_proxy.rb
	modified:   test/functional/associations/test_many_polymorphic_proxy.rb
	modified:   test/functional/associations/test_one_embedded_polymorphic_proxy.rb
	modified:   test/functional/test_sci.rb
	modified:   test/unit/associations/test_many_association.rb
	modified:   test/unit/associations/test_one_association.rb
	modified:   test/unit/test_embedded_document.rb
	modified:   test/unit/test_rails_compatibility.rb
utc
SAFE => W
allow options hash to be passed to safe method
proper WR options
tests
Merge branch 'fh-0.12.0' into fanhattan4

Conflicts:
	.bundle/config
	Gemfile
	Gemfile.lock
	lib/mongo_mapper.rb
	lib/mongo_mapper/extensions/time.rb
	lib/mongo_mapper/plugins/associations/base.rb
	lib/mongo_mapper/plugins/embedded_callbacks.rb
	lib/mongo_mapper/plugins/keys.rb
	lib/mongo_mapper/plugins/querying.rb
	lib/mongo_mapper/plugins/sci.rb
	lib/mongo_mapper/utils.rb
	mongo_mapper.gemspec
	test/functional/associations/test_one_embedded_polymorphic_proxy.rb
	test/functional/test_modifiers.rb
	test/functional/test_safe.rb
	test/functional/test_validations.rb
	test/unit/associations/test_one_association.rb

	new file:   .bundle/config
	modified:   Gemfile
	new file:   Gemfile.lock
	modified:   examples/safe.rb
	modified:   lib/mongo_mapper.rb
	new file:   lib/mongo_mapper/config.rb
	modified:   lib/mongo_mapper/document.rb
	modified:   lib/mongo_mapper/plugins/associations/base.rb
	modified:   lib/mongo_mapper/plugins/associations/belongs_to_association.rb
	modified:   lib/mongo_mapper/plugins/embedded_document.rb
	modified:   lib/mongo_mapper/plugins/keys.rb
	modified:   lib/mongo_mapper/plugins/querying.rb
	modified:   lib/mongo_mapper/plugins/sci.rb
	modified:   lib/mongo_mapper/plugins/validations.rb
	new file:   lib/mongo_mapper/plugins/write_concern.rb
	modified:   lib/mongo_mapper/utils.rb
	modified:   test/functional/test_modifiers.rb
	modified:   test/functional/test_querying.rb
	modified:   test/functional/test_safe.rb
	deleted:    test/functional/test_stack_level_too_deep.rb
	modified:   test/functional/test_validations.rb
	modified:   test/unit/test_mongo_mapper.rb