Update from linux
Merge branch 'master' of git://github.com/rockclimber112358/SmartGeo