Merge pull request #1 from ProjectSWGCore/master

Merge
Test File-12.10.2013
Merge branch 'master' of https://github.com/dennise1975/NGECore2
Merge branch 'master' of https://github.com/dennise1975/NGECore2
Merge branch 'master' of https://github.com/dennise1975/NGECore2
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 into ProjectSWGCore-master
Merge branch 'master' of https://github.com/dennise1975/NGECore2
Merge branch 'master' of https://github.com/dennise1975/NGECore2
Merge branch 'master' of https://github.com/Ziggeh/NGECore2
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Conflicts:
	scripts/object/tangible/terminal/terminal_character_builder.py
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2