updated beta to django 1.7
fixed figfile again
change local_settings.py back to local dev environment
update migrations for all linked modules
add initial database for use with dev env until fixtures are properly created
Merge branch 'master' into apicleanup

Conflicts:
	hydroshare/settings.py