修改xcode7下的bug#64

Open

lizhaobomb wants to merge 3 commits intovigossjjj:masterfrom

lizhaobomb:master

Commits on Jun 21, 2016

1、is_simulator 方法 xcode7里instruments不带Simulator改用“-”判断，
昭召
committed
删除无用的注释
昭召
committed
device 方法revert
昭召
committed