Guild list shows leader name instead of id.
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	public_html/controllers.js
	public_html/pages/guilds.html