Merge branch 'master' of https://github.com/busymachines/busymachines-commons.git

Conflicts:
	src/main/scala/com/busymachines/commons/domain/CommonJsonFormats.scala
#
# 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.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 3 different commit(s) each, respectively.
#