add nick field
some else changes
Merge origin/master

Conflicts:
	SomeDir/newjson.json
	newhtml.html