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

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