Merge pull request #1 from nosun/master

device list
Merge pull request #2 from nosun/master

设备列表
Merge branch 'master' of https://github.com/RedSkyStar/yun-admin
7.18 第一次合并
增加admin修改密码、修改框架
Merge branch 'master' of https://github.com/RedSkyStar/yun-admin into RedSkyStar-master

Conflicts:
	admin/controllers/login.php
	admin/securimage/securimage.php
Merge branch 'RedSkyStar-master'