add localiserId on fields
fix .architect conflict

Conflicts:
	www/.architect