updates
Merge branch 'master' of https://github.com/modemlooper/BuddyPics

Conflicts:
	includes/bpa.core.php
	readme.txt