Bail on missing geoserver data dir
Dump map comments
Merge branch 'master' of git://github.com/opengeo/mapstory
Export and Import users for map comments
Merge branch 'master' of git://github.com/opengeo/mapstory
Migrate Publishing status
add social auth, oauth provider as toggle
Merge branch 'master' into integration

Conflicts:
	settings.py