update django_irods reference SHA
update django_irods submodule
set USE_SOUTH = False, comment out ga_ows and ga_resources from local_settings.py as it throws error regarding geometry
Merge branch 'master' into apicleanup

Conflicts:
	hydroshare/settings.py