a
Merge branch 'dev' of https://github.com/qxj1989/www into dev

Conflicts:
	index.php