...
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/Util.java
	app/controllers/actors/SlaveActor.java