update
Merge branch 'master' of https://github.com/xuwenguang/IPadWall

Conflicts:
update