merge
Merge branch 'master' of https://github.com/cashsun/fightclub

Conflicts:
	js/main_panel.js
	js/main_panel_min.js
	view/main_panel.php