changes everywhere

Conflicts:
	filepicker/forms.py
	filepicker/models.py
	filepicker/views.py
	profile_manager/views.py
	profiles/templates/profiles/index.html
	socialpics_webapp/urls.py
	templates/socialpics_webapp/base.html