Update ows_url of local MapLayers to match new IP
Added a geonode_type property in resourcebase and refactored some code.
Updated base.css with latest changes to base.less
Updated changelog for version 2.0
Merge pull request #1344 from mbertrand/maplayerupdate

Update ows_url of local MapLayers to match new IP
Updated changelog for version 2.0
Updated changelog for version 2.0
Removed a reference from doc to the ACCOUNT_ACTIVATION_DAYS setting, as we use django-user-acconts now an not django-registration anymore.
This fixes #1348.
Merge pull request #1349 from capooti/issue-1348

This fixes #1348.
Merge pull request #1347 from capooti/add-type-property-in-base

Added a geonode_type property in resourcebase and refactored some code.
Fixed #1339 for maps.
Fixed #1339 for documents.
Setting the sort order for profiles.
Merge pull request #1351 from capooti/issue-1339

This fixex #1339
Merge branch 'master' of https://github.com/GeoNode/geonode
Merge branch 'master' of https://github.com/mikefedak/geonode