Updated for picture location changes
Merge branch 'master' of https://github.com/caleb-carroll/havyaka_culture

Conflicts:
	userProfile.php