Added anti portal trap to stop players getting stuck in portals
Merge branch 'master' of https://github.com/addstar/Pandora

Conflicts:
	src/au/com/addstar/pandora/MasterPlugin.java

Fixed conflicts