Fix String literals being on the wrong side of equals().
Merge remote-tracking branch 'origin/master'

Conflicts:
	Demigods-Engine/src/main/java/com/censoredsoftware/demigods/engine/mythos/Ability.java
	Demigods-Engine/src/main/java/com/censoredsoftware/demigods/engine/util/Abilities.java
A few fixes.