fixed ImportError caused by circular reference
Merge branch 'HalloweenBugFixes'
prep for version 1.2.1 using django 1.7
prep for version 1.2.1 using django 1.7
update __init__.py to re-add the resource page navigation properly
update files for ver 1.2.1 release
giant purge of currently unused files for django 1.7 migration
update urls.py to reflect deprecation of ga_interactive and hs_party
update urls.py for static file handling, update settings.py to no longer use South
update from django 1.7.1 to 1.7.2 in requirements.txt
modify fig.yml command: for hydroshare container, additional mezzanine reference in settings.py
revert back to django 1.7.1 for hs_base build
removed hs_party from installed apps for now
Merge branch 'master' into apicleanup

Conflicts:
	hydroshare/settings.py
	urls.py