Merge remote-tracking branch 'trinitycore/4.3.4' into 4.3.4

Conflicts:
	sql/updates/world/2013_07_19_01_world_spell_script_misc_434.sql