PC broke, back again, started with a random teleporter, teleports every 6 hours, doesn't announce where, players need to find it. Will give out Hide and seek quests (need to add more locations)

Changed a port on the portal master
Just posting this to have a backup and a fresh pull incase something goes wrong while getting the new trinity core updates
Merge branch 'master' of https://github.com/devalacarte/newPhoenix