added tester role
Merge branch 'master' into pedantic_grammar_spelling

Conflicts:
	assets/config/production.json