player menu
clean up merge
remove built files from git
ignore built files from git
Merge branch 'master' of github.com:dawicorti/meishengo

Conflicts:
	Makefile
	lib/login-form/template.js
	lib/login-page/content-template.js
	lib/login-page/footer-template.js
	lib/players-list/template.js
	lib/players-page/index.js
	lib/top-menu/template.js
	public/build/meishengo.min.css
	public/build/meishengo.min.js