fix document form and view
Merge branch 'master' of https://github.com/GeoNode/geonode into paverforwin
Merge branch 'paverforwin' of github.com:nathanhilbert/geonode into paverforwin