Initial commit
Merge branch 'develop' of https://github.com/caveofgeek/football into develop
update php systax
Merge branch 'develop' of https://github.com/caveofgeek/football into develop
update
qw
update game/index.php
Merge branch 'develop' into feature/update-systax

Conflicts:
	admin/active-link-exchange.php
	admin/add-ads-a2.php
	admin/add-ads-a3.php
	admin/add-ads-a4.php
	admin/add-ads-a5.php
	admin/add-ads-a6.php
	admin/add-ads-a7.php
	admin/add-ads-a8.php
	admin/add-ads-a9.php
	admin/add-data-category.php
	admin/add-game-match.php
	admin/add-league.php
	admin/add-t-ded.php
	admin/add-tded-zean.php
	admin/admin.php
	admin/ads-a1.php
	admin/ads-a2.php
	admin/ads-a3.php
	admin/ads-a4.php
	admin/ads-a5.php
	admin/ads-a6.php
	admin/ads-a7.php
	admin/ads-a8.php
	admin/ads-a9.php
	admin/ads.php
	admin/all-admin-analyze.php
	admin/all-game-league.php
	admin/all-game-level.php
	admin/all-game-match.php
	admin/all-main-category.php
	admin/all-member.php
	admin/all-post-analyze.php
	admin/all-webboard.php
	admin/ban-ip.php
	admin/ban-word.php
	admin/bg.php
	admin/block-email.php
	admin/cancel-contact-del-post-analyze.php
	admin/cancel-contact-del-post.php
	admin/contact.php
	admin/data.php
	admin/del-admin-analyze.php
	admin/del-admin.php
	admin/del-ads2.php
	admin/del-ads3.php
	admin/del-ads4.php
	admin/del-ads5.php
	admin/del-ads6.php
	admin/del-ads7.php
	admin/del-ads8.php
	admin/del-ads9.php
	admin/del-ball-ded.php
	admin/del-ban-ip.php
	admin/del-ban-word.php
	admin/del-bg.php
	admin/del-block-email.php
	admin/del-contact-del-post-analyze.php
	admin/del-contact-del-post.php
	admin/del-contact.php
	admin/del-data-category.php
	admin/del-game-league.php
	admin/del-game-match.php
	admin/del-league.php
	admin/del-link-exchange.php
	admin/del-post-analyze.php
	admin/del-province.php
	admin/del-t-ded.php
	admin/del-tded-zean.php
	admin/del-webboard-category.php
	admin/del-webboard.php
	admin/edit-admin-analyze.php
	admin/edit-admin.php
	admin/edit-ads-a2.php
	admin/edit-ads-a3.php
	admin/edit-ads-a4.php
	admin/edit-ads-a5.php
	admin/edit-ads-a6.php
	admin/edit-ads-a7.php
	admin/edit-ads-a8.php
	admin/edit-ads-a9.php
	admin/edit-ban-ip.php
	admin/edit-ban-word.php
	admin/edit-block-email.php
	admin/edit-category.php
	admin/edit-data-category.php
	admin/edit-game-league.php
	admin/edit-game-match.php
	admin/edit-league.php
	admin/edit-province.php
	admin/edit-t-ded.php
	admin/edit-tded-zean.php
	admin/edit-webboard-category.php
	admin/edit-webboard.php
	admin/edit-zean-name.php
	admin/fb.php
	admin/football.php
	admin/footer-logo.php
	admin/game-setting.php
	admin/league-t-ded.php
	admin/linkcolor.php
	admin/linkexchange.php
	admin/list-contact-del-post-analyze.php
	admin/list-del-data-category.php
	admin/login.php
	admin/logout.php
	admin/mem-conditions.php
	admin/member-detail.php
	admin/news-index.php
	admin/p-add-game-match.php
	admin/p-add-province.php
	admin/p-add-t-ded.php
	admin/p-add-tded-zean.php
	admin/p-admin-analyze.php
	admin/p-admin.php
	admin/p-ban-ip.php
	admin/p-ban-word.php
	admin/p-bg.php
	admin/p-block-email.php
	admin/p-data.php
	admin/p-edit-admin-analyze.php
	admin/p-edit-admin.php
	admin/p-edit-ban-ip.php
	admin/p-edit-ban-word.php
	admin/p-edit-block-email.php
	admin/p-edit-game-match.php
	admin/p-edit-province.php
	admin/p-edit-t-ded.php
	admin/p-edit-tded-zean.php
	admin/p-edit-webboard-category.php
	admin/p-edit-zean-name.php
	admin/p-fb.php
	admin/p-footer-logo.php
	admin/p-game-setting.php
	admin/p-link-exchange.php
	admin/p-linkcolor.php
	admin/p-site-logo.php
	admin/p-stats.php
	admin/p-webboard-category.php
	admin/point-game-match.php
	admin/province.php
	admin/reset-score.php
	admin/search-member.php
	admin/search-webboard.php
	admin/sitelogo.php
	admin/stats.php
	admin/sticky.php
	admin/stop-game-match.php
	admin/t-ded.php
	admin/tded-zean.php
	admin/webboard-category.php
	ads.php
	all-analyze.php
	all-category.php
	all-football.php
	all-t-ded.php
	confirm-del-post-analyze.php
	confirm-del-post.php
	contact.php
	fonts/fontawesome-webfont.eot
	fonts/fontawesome-webfont.svg
	fonts/fontawesome-webfont.ttf
	fonts/fontawesome-webfont.woff
	forgot-pass.php
	game/index.php
	game/level.php
	game/list-play-game.php
	game/playgame.php
	game/template.php
	index.php
	link-exchange.php
	member-condition.php
	member/edit-personal.php
	member/index.php
	member/list-webboard.php
	member/logout.php
	member/template.php
	mod/add-analyze.php
	mod/all-post-analyze.php
	mod/edit-post-analyze.php
	mod/login.php
	mod/main.php
	mod/p-edit-admin-analyze.php
	mod/template.php
	post-analyze-detail.php
	post-detail.php
	register.php
	search-tag.php
	t-ded.php
	template-board.php
	template.php
	webboard-category.php
	webboard-detail.php
	webboard/del-webboard-reply.php
	webboard/del-webboard.php
	webboard/edit-webboard-reply.php
	webboard/edit-webboard.php
	webboard/index.php
	webboard/new-topic.php
	webboard/template.php
	webboard/webboard-replay.php

qw
Merge pull request #5 from caveofgeek/feature/update-systax

Feature/update systax