Merge remote-tracking branch 'origin/master'

Conflicts:
	DNSClient/src/Dnsclient.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	DNSClient/src/Dnsclient.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	DNSClient/src/Dnsclient.java
Merge remote-tracking branch 'origin/master'