no message
Merge branch 'master' of github.com:MinionBots/FFXIVMinion

Conflicts:
	ffxivminion/ffxiv_common_cne.lua