上传头像
Merge branch 'master' of https://github.com/SolarHalo/odds_game
Merge branch 'master' of https://github.com/SolarHalo/odds_game
same config
腾讯微博登录
Merge branch 'master' of https://github.com/SolarHalo/odds_game.git
腾讯微博登录
ddMerge branch 'master' of https://github.com/SolarHalo/odds_game

Conflicts:
	odds_game/configs/config.php
	odds_game/templates_c/14a6b169aa777ee5825af2776423beb5f0e434e8.file.header.tpl.php
	odds_game/templates_c/48012658b272dafdc1f71bf93854b6c3fb37280d.file.topnav.tpl.php
	odds_game/templates_c/4c5bc99d760d79701627a07a3231d368552152ce.file.footer.tpl.php
	odds_game/templates_c/4cb9971e16f873fae861d7c164afa011f2588d64.file.index.tpl.php
	odds_game/templates_c/762132b418d30b17420ab5a4065dee69a3d8014d.file.loginsuccess.tpl.php
	odds_game/templates_c/7829d002146fa6adbd568f4005aa393a21cdecb2.file.login.tpl.php
	odds_game/templates_c/782bfdaff97527b03e9742983c8a8df98ed635e6.file.eventtable.tpl.php
	odds_game/templates_c/7a9ce0892a3b5d1431cf75903e89d3f3021e005f.file.normalusermanage.tpl.php
	odds_game/templates_c/7ea2385ad6a27a67b559bded58e12812c130bec7.file.manager.tpl.php
	odds_game/templates_c/8bdb666156e93c7bac08525529036f0b7296fb0d.file.footer.tpl.php
	odds_game/templates_c/8eeea0c8560516bde6c2ddbdcbc8affa226bdba1.file.index.tpl.php
	odds_game/templates_c/9f7eae61e040358732b77d30daf3b1b511f257d3.file.register.tpl.php
	odds_game/templates_c/acdd348b527cb548e62bbe41b316e444819bced8.file.header.tpl.php
	odds_game/templates_c/b5c676680cccbe6d33ae913e1c8e963238c68807.file.oddsmanage.tpl.php
	odds_game/templates_c/d46e8822416e81d7ebadc4c3fa22082667513789.file.usermanage.tpl.php
	odds_game/templates_c/ea6b468cf192e261a054f71c1c7e966f349b28c5.file.loginForm.tpl.php
腾讯微博登录
Merge branch 'master' of https://github.com/SolarHalo/odds_game
delete urlroot
系统退出
Merge branch 'master' of https://github.com/SolarHalo/odds_game
Merge branch 'master' of https://github.com/SolarHalo/odds_game
Merge branch 'master' of https://github.com/SolarHalo/odds_game
动态信息
Merge branch 'master' of https://github.com/SolarHalo/odds_game
Merge branch 'master' of https://github.com/SolarHalo/odds_game
touzhu
Merge branch 'master' of https://github.com/SolarHalo/odds_game