add by v2
v1 modify
Merge branch 'feature/proj_v1.0.2' into feature/proj_v1.0.1

Conflicts:
	welcome.php