buy title #39
Merge remote-tracking branch 'remotes/upstream/rpg_ui' into issue-33-github-login

Conflicts:
	emergent/urls.py