Modified
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	org.cse.visiri.communication.environment/src/main/java/org/cse/visiri/communication/Environment.java
Merge remote-tracking branch 'origin/master'
Changed getNQ Map