First Resto Druid updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	ClassLibs/Druid/Options.lua