possible new upgrade textures
changed tiering of icons
merge conflict resolution for terrain.png
Merge branch 'master' of git://github.com/Cloudhunter/OpenCCSensors
return error message rather than throwing error
Merge pull request #110 from lyqyd/master

Change to error return methodology.