Updating gemlock
Merge remote-tracking branch 'origin/master' into release

Conflicts:
	README.txt
Merge remote-tracking branch 'origin/release' into development#test_sync_branch

Conflicts:
	README.txt