Changed Justice - all playables in
Merge remote-tracking branch 'origin/master'

Conflicts:
	Character.java
	Justice.java