modify index.php
modify index.php
Merge branch 'cj'

Conflicts:
	index.php
modify index add $a
modify index.php common.php
1547 Merge branch 'cj'

Conflicts:
	index.php
modify index.php on function
modify common.php $config
modify common.php add pwd
Merge branch 'jason'

Conflicts:
	common.php
modify common.php
modify index.php