Minor refactoring
Merge branch 'master' of https://github.com/actorapp/actor-api-schema

Conflicts:
	actor.json