Fixed directory structure

heroku

test
fixup
Merge branch 'master' of github.com:warmstart/RescueManagementSystem

Conflicts:
	manage.py
	rms-server/rms_server/manage.py
	rms-server/rms_server/rms_server/settings.py
	rms-server/rms_server/rms_server/wsgi.py
	rms_server/manage.py
	rms_server/rms_server/settings.py
	rms_server/rms_server/urls.py
	rms_server/rms_server/wsgi.py
	rms_server/settings.py
	rms_server/wsgi.py