sync osgeolive script to osgeo svn
Merge branch 'master' of git://github.com/GeoNode/geonode
sync with osgeolive svn
Merge pull request #980 from kalxas/master

sync with osgeolive svn