Added S3, set up models for giver.
Merge branch 'master' of https://github.com/YashYash/Pangea-live

Conflicts:
	.idea/dataSources.xml
	.idea/workspace.xml
	pangea_project/charity_app/__init__.pyc
	pangea_project/giver_app/__init__.pyc
	pangea_project/pangea_project/__init__.pyc
	pangea_project/pangea_project/settings.py
	pangea_project/pangea_project/settings.pyc
	pangea_project/pangea_project/urls.py
	pangea_project/pangea_project/urls.pyc
	pangea_project/user_app/__init__.pyc