fix 0 pictures exe throw exception
Merge branch 'develop' of github.com:dragondjf/CloudSetuper into develop
resolve conflic,and merge code 2014-10-31
merge code
Merge branch 'develop' of github.com:dragondjf/CloudSetuper into develop
merge code
update code