test update database
Merge branch 'beta' of https://github.com/LinkedDestiny/LinkNet
test update database
change README
test
Merge branch 'master' of https://github.com/LinkedDestiny/LinkNet
delete
update
Merge branch 'master' of https://github.com/LinkedDestiny/LinkNet

Conflicts:
	code/LinkNetServer/bin/libs/wmqtt.jar
	server/LinkNet_2/bin/com/link/util/UtilDate.class
	server/LinkNet_2/src/com/link/util/UtilDate.java
upload
Merge branch 'beta' of https://github.com/LinkedDestiny/LinkNet

Conflicts:
	README
Merge branch 'master' of https://github.com/LinkedDestiny/LinkNet
test
test
database update