Merge branch 'master' of github.com:Exartu/Exartu-CRM

Conflicts:
	client/js/addContactable.js
	server/collections/objectType.js
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Committer: psoto <psoto@ubuntu.(none)>
#
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 1 different commit each, respectively.
#
# Changes to be committed:
#
#	modified:   client/js/addContactable.js
#	modified:   server/collections/contactable.js
#	modified:   server/collections/objectType.js
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	client/js/addContactable.js.orig
#	server/collections/objectType.js.BACKUP.10600.js
#	server/collections/objectType.js.BACKUP.10739.js
#	server/collections/objectType.js.BASE.10600.js
#	server/collections/objectType.js.BASE.10739.js
#	server/collections/objectType.js.LOCAL.10600.js
#	server/collections/objectType.js.LOCAL.10739.js
#	server/collections/objectType.js.REMOTE.10600.js
#	server/collections/objectType.js.REMOTE.10739.js
#	server/collections/objectType.js.orig