Upstream API changes
Merge branch 'master' of github.com:Runsafe/Cheeves

Conflicts:
	src/no/runsafe/cheeves/commands/AwardAchievement.java