updating templates code
Merge branch 'master' of https://github.com/cbdavis/RSemanticMediaWikiBot

Conflicts:
	templates.R