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

Conflicts:
	db/DBadapter.php