Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/scala/com/busymachines/commons/test/prefab/party/api/PartiesApiTests.scala
	src/test/scala/com/busymachines/commons/test/prefab/party/api/UsersApiTests.scala

removed some inspection warnings

error