reset master
remove sub module
submodule removed
Merge branch 'master' of https://github.com/themanaworld/tmwa-server-data

Conflicts:
	client-data
Merge branch 'master' of https://github.com/themanaworld/tmwa-server-data
Merge branch 'master' of https://github.com/themanaworld/tmwa-server-data
Readd a local news entry; fix IRC link in old news
Merge branch 'master' of https://github.com/themanaworld/tmwa-server-data
bringing myself update to for a pull request
Put Nivalis into the ferry system and allow Frozenbread to send you back anywhere. Diryn Teleports the player to the College instead in Nivalis for 1500gp
Put Nivalis into the ferry system and allow Frozenbread to send you back anywhere. Diryn Teleports the player to the College instead in Nivalis for 1500gp