Fixed "Evaquate the Merchant Square" quest
Merge branch 'master' of https://github.com/Corsol/scripts into Corsol-master
- Merging changes from Corsol for Gilneas start area
Conflicts:
	sql/scriptdev2_script_full.sql
Merge branch 'Corsol-master'