latest namespace commit
Merge branch 'masterMerge' of https://github.com/simpleclicks/Thunderbolts-Repo into masterMerge

Conflicts:
	src/poke/resources/NameSpaceResource.java
	src/poke/server/nconnect/NodeResponseQueue.java