Merge pull request #3 from nosun/master

7.18 First Merge With nosun
【7.18】完成 "站点设置" "修改密码" by wyf
Merge branch 'master' of https://github.com/RedSkyStar/yun-admin
Merge pull request #4 from nosun/master

[7.18 night] changed device by nosun
Merge remote branch 'origin/nosun-dev'

Conflicts:
	admin/views/system_main.php
	admin/views/system_setting.php
Merge pull request #5 from nosun/master

[7.19 afternoon]  get new from Nosun
Merge remote branch 'origin/nosun-dev'
Merge pull request #6 from nosun/master

[7.19 17:30] get new patch
Merge branch 'master' of https://github.com/RedSkyStar/yun-admin
Merge pull request #2 from RedSkyStar/master

[7.19 18:36 by wyf] merge request