make labels for wiki primitives
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/mneme/agents/WikiAgent.java